Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 757ecedc authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Remove use of hidden TelephonyManager methods"

parents b3c6951e 62280c72

src/com/android/dialer/SpecialCharSequenceMgr.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+4 −1
Original line number Diff line number Diff line
@@ -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.