summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-01-26 20:06:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-26 20:06:29 +0000
commitc2ed94ae16f530881dc4abf79e39916d4828a2b7 (patch)
tree09387177abdf6f7b5e8eed0debc5ab94b9998eb1
parentbdc6479ebc08cc6989d5ae75fa38dee4065349b0 (diff)
parentda841365454b2ab3f34310a0ac6fb6bf844d2cb2 (diff)
am 93970c64: am 624f4b74: am 73be6292: Merge "Hide emergency callback number when slot2 SIM is default." into lmp-mr1-dev
* commit '93970c644291a3dcfd55e456b48b338a6110b5f7': Hide emergency callback number when slot2 SIM is default.
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 0d04f48f8..cb378a687 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -340,9 +340,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
}
}
- 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;