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

Commit 6ec886a0 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev

parents 8865c08a ae6a2142

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        if (mSubscriptionInfo == null) {

            return;

        }



        mTelephonyManager =

            mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());

        mPhoneStateListener = getPhoneStateListener();

        updateLatestAreaInfo();

        updateSubscriptionStatus();

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ public class SimStatusDialogControllerTest { 
        doReturn(null).when(mSignalStrength).getCellSignalStrengths();

        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());

        when(mSubscriptionInfo.getSubscriptionId())

            .thenReturn(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);



        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);

        ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);