commit 9cf11515781910c7fda66a8a27a0fa14ab1ed2af
author Amit Mahajan <amitmahajan@google.com> Mon Nov 09 11:40:48 2015 -0800
committer Amit Mahajan <amitmahajan@google.com> Fri Nov 20 16:51:59 2015 -0800
tree 80cbd8592f44309f047bcd8e3dba57877dba866f
parent fff8884994a24d20b2d6f09bc5d6f826af5b9d9e

Phone refactor (merging Gsm and Cdma phones)

Bug: 25793157
Change-Id: I8539846dcb8a3a8971616e63aa8b373ab1032259

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d152e22..6f828db 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2457,14 +2457,20 @@
     public String getLine1NumberForDisplay(int subId, String callingPackage) {
         // This is open to apps with WRITE_SMS.
         if (!canReadPhoneNumber(callingPackage, "getLine1NumberForDisplay")) {
+            if (DBG_MERGE) log("getLine1NumberForDisplay returning null due to permission");
             return null;
         }
 
         String iccId = getIccId(subId);
         if (iccId != null) {
             String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
+            if (DBG_MERGE) {
+                log("getLine1NumberForDisplay returning " +
+                        mTelephonySharedPreferences.getString(numberPrefKey, null));
+            }
             return mTelephonySharedPreferences.getString(numberPrefKey, null);
         }
+        if (DBG_MERGE) log("getLine1NumberForDisplay returning null as iccId is null");
         return null;
     }