invisiblek

execve("/system/bin/rild.old", ["rild.old"], [/* 17 vars */]) = 0
mprotect(0xb6f11000, 4096, PROT_READ)   = 0
set_tid_address(0xb6f13b40)             = 4656
set_tls(0xb6f13b80, 0xb6f11ff4, 0x4, 0xb6f14004, 0xbeefea94) = 0
mmap2(NULL, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6eec000
madvise(0xb6eec000, 12288, MADV_MERGEABLE) = 0
mprotect(0xb6eec000, 4096, PROT_NONE)   = 0
sigaltstack({ss_sp=0xb6eed000, ss_flags=0, ss_size=8192}, NULL) = 0
prctl(0x53564d41 /* PR_??? */, 0, 0xb6eed000, 0x2000, 0xb6f0f7bf) = 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6eeb000

invisiblek

execve("/system/bin/rild.old", ["rild.old"], [/* 17 vars */]) = 0
mprotect(0xb6f4b000, 4096, PROT_READ)   = 0
set_tid_address(0xb6f4db40)             = 4575
set_tls(0xb6f4db80, 0xb6f4bff4, 0x4, 0xb6f4e004, 0xbeee3a94) = 0
mmap2(NULL, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6f26000
madvise(0xb6f26000, 12288, MADV_MERGEABLE) = 0
mprotect(0xb6f26000, 4096, PROT_NONE)   = 0
sigaltstack({ss_sp=0xb6f27000, ss_flags=0, ss_size=8192}, NULL) = 0
prctl(0x53564d41 /* PR_??? */, 0, 0xb6f27000, 0x2000, 0xb6f497bf) = 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6f25000

invisiblek

execve("/system/bin/rild.old", ["rild.old"], ["_=/system/xbin/strace", "ANDROID_DATA=/data", "HOME=/data", "ANDROID_STORAGE=/storage", "TERM=linux", "VIBE_PIPE_PATH=/dev/pipes", "ANDROID_BOOTLOGO=1", "USER=root", "TMPDIR=/data/local/tmp", "ANDROID_ASSETS=/system/app", "LD_PRELOAD=libsigchain.so", "BOOTCLASSPATH=/system/framework/"..., "ASEC_MOUNTPOINT=/mnt/asec", "SHELL=/system/bin/sh", "ANDROID_SOCKET_adbd=11", "HOSTNAME=vs985", "EXTERNAL_STORAGE=/sdcard", "ANDROID_CACHE=/cache", "TERMINFO=/system/etc/terminfo", "MKSH=/system/bin/sh", "PATH=/sbin:/vendor/bin:/system/s"..., "SYSTEMSERVERCLASSPATH=/system/fr"..., "ANDROID_PROPERTY_WORKSPACE=9,0", "ANDROID_ROOT=/system"]) = 0
mprotect(0xb6feb000, 4096, PROT_READ)   = 0
set_tid_address(0xb6fedb40)             = 3941
set_tls(0xb6fedb80, 0xb6febff4, 0x4, 0xb6fee004, 0xbe8f1a14) = 0
mmap2(NULL, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6fc6000
madvise(0xb6fc6000, 12288, MADV_MERGEABLE) = 0
mprotect(0xb6fc6000, 4096, PROT_NONE)   = 0
sigalt

invisiblek

execve("/system/bin/rild.old", ["rild.old"], [/* 24 vars */]) = 0
mprotect(0xb6f68000, 4096, PROT_READ)   = 0
set_tid_address(0xb6f6ab40)             = 2627
set_tls(0xb6f6ab80, 0xb6f68ff4, 0x4, 0xb6f6b004, 0xbea4da14) = 0
mmap2(NULL, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6f43000
madvise(0xb6f43000, 12288, MADV_MERGEABLE) = 0
mprotect(0xb6f43000, 4096, PROT_NONE)   = 0
sigaltstack({ss_sp=0xb6f44000, ss_flags=0, ss_size=8192}, NULL) = 0
prctl(0x53564d41 /* PR_??? */, 0, 0xb6f44000, 0x2000, 0xb6f667bf) = 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6f42000

invisiblek

execve("/system/bin/rild.old", ["rild.old"], [/* 24 vars */]) = 0
mprotect(0xb6f25000, 4096, PROT_READ)   = 0
set_tid_address(0xb6f27b40)             = 2585
set_tls(0xb6f27b80, 0xb6f25ff4, 0x4, 0xb6f28004, 0xbea22a14) = 0
mmap2(NULL, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6f00000
madvise(0xb6f00000, 12288, MADV_MERGEABLE) = 0
mprotect(0xb6f00000, 4096, PROT_NONE)   = 0
sigaltstack({ss_sp=0xb6f01000, ss_flags=0, ss_size=8192}, NULL) = 0
prctl(0x53564d41 /* PR_??? */, 0, 0xb6f01000, 0x2000, 0xb6f237bf) = 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb6eff000

invisiblek

diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java
index 14d2934..87cc4a7 100644
--- a/src/java/com/android/internal/telephony/PhoneFactory.java
+++ b/src/java/com/android/internal/telephony/PhoneFactory.java
@@ -234,9 +234,9 @@ public class PhoneFactory {
                 // Start monitoring after defaults have been made.
                 // Default phone must be ready before ImsPhone is created
                 // because ImsService might need it when it is being opened.
-                for (int i = 0; i < numPhones; i++) {
-                    sPhones[i].startMonitoringImsService();

invisiblek

#!/usr/bin/python2

branches=['staging/cm-14.0', 'cm-14.0', 'refs/heads/cm-14.0', 'refs/heads/staging/cm-14.0']

print("Current:")
for b in branches:
  print(b + " -> " + b.split('/')[-1])

print("")
print("With patch:")

invisiblek

diff --git a/tools/repopick.py b/tools/repopick.py
index 6e40f38..2b436ef 100755
--- a/tools/repopick.py
+++ b/tools/repopick.py
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     xml_root = ElementTree.fromstring(manifest)
     projects = xml_root.findall('project')
     remotes = xml_root.findall('remote')
-    default_revision = xml_root.findall('default')[0].get('revision').split('/')[-1]
+    default_revision = xml_root.findall('default')[0].get('revision')

invisiblek

diff --git a/tools/repopick.py b/tools/repopick.py
index 6e40f38..2b436ef 100755
--- a/tools/repopick.py
+++ b/tools/repopick.py
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     xml_root = ElementTree.fromstring(manifest)
     projects = xml_root.findall('project')
     remotes = xml_root.findall('remote')
-    default_revision = xml_root.findall('default')[0].get('revision').split('/')[-1]
+    default_revision = xml_root.findall('default')[0].get('revision')

invisiblek

Current:
staging/cm-14.0 -> cm-14.0
cm-14.0 -> cm-14.0
refs/heads/cm-14.0 -> cm-14.0
refs/heads/staging/cm-14.0 -> cm-14.0

With patch:
staging/cm-14.0 -> staging/cm-14.0
cm-14.0 -> cm-14.0
refs/heads/cm-14.0 -> refs/heads