commit 757ecedc09bf053875a3208832e13b38ea194fb9
author Yorke Lee <yorkelee@google.com> Mon Nov 25 18:55:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 25 18:55:04 2013 +0000
tree 23870ea7248a2122624d680922e4c114de5d5da1
parent b3c6951e15865ac5a9007d281e12f380a16967e8
parent 62280c72fd651b00dd5499f4c3b32f30be57ce0d

Merge "Remove use of hidden TelephonyManager methods"

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index fdef263..f4f818a 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -158,7 +158,7 @@
         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 @@
         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;

tests/src/com/android/dialer/calllog/CallLogFragmentTest.java

diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
index 4ccdaaf..d0a8725 100644
--- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
@@ -20,6 +20,7 @@
 import android.app.FragmentTransaction;
 import android.content.ComponentName;
 import android.content.ContentUris;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.MatrixCursor;
@@ -121,7 +122,9 @@
         // Wait for the fragment to be loaded.
         getInstrumentation().waitForIdleSync();
 
-        mVoicemail = TelephonyManager.getDefault().getVoiceMailNumber();
+        final TelephonyManager telephonyManager =
+                (TelephonyManager) mActivity.getSystemService(Context.TELEPHONY_SERVICE);
+        mVoicemail = telephonyManager.getVoiceMailNumber();
         mAdapter = mFragment.getAdapter();
         // Do not process requests for details during tests. This would start a background thread,
         // which makes the tests flaky.