commit da841365454b2ab3f34310a0ac6fb6bf844d2cb2
author Nancy Chen <nancychen@google.com> Mon Jan 26 19:59:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 26 19:59:56 2015 +0000
tree c02facb058e9a60a54a3360552b67e5bdcccbd0b
parent 425e86338cee8627c36aacee9f139011a42192b4
parent 34e3854f6d6dd5bb2c530f1ed44934d8aacf75af

am 624f4b74: am 73be6292: Merge "Hide emergency callback number when slot2 SIM is default." into lmp-mr1-dev

* commit '624f4b746592dbf39382842d8cdab78527c057ce':
  Hide emergency callback number when slot2 SIM is default.

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 0d04f48..cb378a6 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -340,9 +340,8 @@
             }
         }
 
-        TelephonyManager telephonyManager =
-                (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
-        String simNumber = telephonyManager.getLine1Number();
+        TelecomManager mgr = InCallPresenter.getInstance().getTelecomManager();
+        String simNumber = mgr.getLine1Number(mPrimary.getAccountHandle());
         if (PhoneNumberUtils.compare(callbackNumber, simNumber)) {
             Log.d(this, "Numbers are the same; not showing the callback number");
             callbackNumber = null;