summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-11-25 10:57:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-25 10:57:03 -0800
commit936cec67ede8368f80fc2946e537fe992f5d00cf (patch)
tree357919659d08d0dc7e6dc022cb72d16107124b09 /src
parent65d74d1987732bdc36def7b06f83bc5d2a66eb0f (diff)
parent757ecedc09bf053875a3208832e13b38ea194fb9 (diff)
am 757ecedc: Merge "Remove use of hidden TelephonyManager methods"
* commit '757ecedc09bf053875a3208832e13b38ea194fb9': Remove use of hidden TelephonyManager methods
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/SpecialCharSequenceMgr.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index fdef263fb..f4f818afc 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -158,7 +158,7 @@ public class SpecialCharSequenceMgr {
TelephonyManager telephonyManager =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonyManager == null
- || !TelephonyCapabilities.supportsAdn(telephonyManager.getCurrentPhoneType())) {
+ || telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) {
return false;
}
@@ -243,7 +243,7 @@ public class SpecialCharSequenceMgr {
TelephonyManager telephonyManager =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonyManager != null && input.equals(MMI_IMEI_DISPLAY)) {
- int phoneType = telephonyManager.getCurrentPhoneType();
+ int phoneType = telephonyManager.getPhoneType();
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
showIMEIPanel(context, useSystemWindow, telephonyManager);
return true;