summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-01-24 19:58:51 -0800
committerNancy Chen <nancychen@google.com>2015-01-24 19:58:51 -0800
commit775a9e4ea42602d81b535cc753442d93f2a1e047 (patch)
treec1d1040abf58f392cf534713ac824df2675c3c9a
parentf06f97fa1c13576ce2b42f8f0e9ad088f2991607 (diff)
downloadpackages_apps_InCallUI-775a9e4ea42602d81b535cc753442d93f2a1e047.tar.gz
packages_apps_InCallUI-775a9e4ea42602d81b535cc753442d93f2a1e047.tar.bz2
packages_apps_InCallUI-775a9e4ea42602d81b535cc753442d93f2a1e047.zip
Hide emergency callback number when slot2 SIM is default.
Because emergency calls are always made from the SIM in slot1, when slot2 has the SIM set for default outgoing call, the InCallUI currently thinks the emergency callback number is different from the number being called from (the code only uses the default number). The fix is to check the line 1 number of the phone account being used instead of the default phone account. Bug: 19087382 Change-Id: I90a096f63493affea979689c7ad188eec7109c08
-rw-r--r--src/com/android/incallui/CallCardPresenter.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java
index 0d04f48f..cb378a68 100644
--- a/src/com/android/incallui/CallCardPresenter.java
+++ b/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;