commit 8cec13452b202b6eacab492194814d98d216f122
author Amit Mahajan <amitmahajan@google.com> Thu Dec 17 11:23:50 2015 -0800
committer Amit Mahajan <amitmahajan@google.com> Tue Dec 22 15:59:25 2015 -0800
tree a1ccb0343a363737c65e120027a160f7832ece2b
parent d3f437e97eac47a8fb6bcf8176b7248052627ec0

Call Phone method directly instead of via PhoneSubInfo.

Bug: 25793157
Change-Id: I5e6174d0385b9f798f75f047afd9447d95f29c3b

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

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 4603f3d..d2ea67e 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -26,6 +26,7 @@
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.PersistableBundle;
+import android.os.ServiceManager;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -38,6 +39,7 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
+import com.android.internal.telephony.IPhoneSubInfo;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.phone.PhoneGlobals;
@@ -102,8 +104,7 @@
             if (line1Number == null) {
                 line1Number = "";
             }
-            String subNumber = mPhone.getPhoneSubInfo().getLine1Number(
-                    mPhone.getContext().getOpPackageName());
+            String subNumber = mPhone.getLine1Number();
             if (subNumber == null) {
                 subNumber = "";
             }