commit ce95274195d591b34d7e278ea9e34e3786a9d3ec
author Ihab Awad <ihab@google.com> Tue Jul 22 16:02:20 2014 -0700
committer Ihab Awad <ihab@google.com> Tue Jul 22 17:57:32 2014 -0700
tree 4591aaf075d08fa052cdcaa11401851cbcef83b3
parent eb8771e9b44fcc885c17d3ff4a3358fcd0b21c6e

Point fixes to unblock Sprout phone debugging

Change-Id: Ia982e7949eaed99f90faa26a0847ee95144f9aa6

src/com/android/services/telephony/TelecommAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecommAccountRegistry.java b/src/com/android/services/telephony/TelecommAccountRegistry.java
index 509a410..cef546d 100644
--- a/src/com/android/services/telephony/TelecommAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecommAccountRegistry.java
@@ -44,6 +44,8 @@
         AccountEntry(Phone phone, boolean isDummy) {
             mPhone = phone;
             mAccount = registerPstnPhoneAccount(isDummy);
+            Log.d(this, "Registered phoneAccount: %s with handle: %s",
+                    mAccount, mAccount.getAccountHandle());
             mIncomingCallNotifier = new PstnIncomingCallNotifier((PhoneProxy) mPhone);
         }
 
@@ -62,9 +64,13 @@
             // Populate the phone account data.
             long subId = mPhone.getSubId();
             int slotId = mPhone.getPhoneId() + 1;
+            String line1Number = telephonyManager.getLine1Number(subId);
+            if (line1Number == null) {
+                line1Number = "";
+            }
             PhoneAccount account = new PhoneAccount(
                     phoneAccountHandle,
-                    Uri.fromParts(TEL_SCHEME, telephonyManager.getLine1Number(subId), null),
+                    Uri.fromParts(TEL_SCHEME, line1Number, null),
                     mPhone.getPhoneSubInfo().getLine1Number(),
                     PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION |
                             PhoneAccount.CAPABILITY_CALL_PROVIDER,