diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-11-25 10:57:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-25 10:57:03 -0800 |
| commit | 936cec67ede8368f80fc2946e537fe992f5d00cf (patch) | |
| tree | 357919659d08d0dc7e6dc022cb72d16107124b09 | |
| parent | 65d74d1987732bdc36def7b06f83bc5d2a66eb0f (diff) | |
| parent | 757ecedc09bf053875a3208832e13b38ea194fb9 (diff) | |
am 757ecedc: Merge "Remove use of hidden TelephonyManager methods"
* commit '757ecedc09bf053875a3208832e13b38ea194fb9':
Remove use of hidden TelephonyManager methods
| -rw-r--r-- | src/com/android/dialer/SpecialCharSequenceMgr.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/calllog/CallLogFragmentTest.java | 5 |
2 files changed, 6 insertions, 3 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; diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index 4ccdaaf33..d0a87259c 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.FragmentManager; 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 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme // 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. |