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

Commit 62f6b96b authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
parents 5da8b8b9 6ec886a0
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
        if (mSubscriptionInfo == null) {
        if (mSubscriptionInfo == null) {
            return;
            return;
        }
        }

        mTelephonyManager =
            mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
        mPhoneStateListener = getPhoneStateListener();
        mPhoneStateListener = getPhoneStateListener();
        updateLatestAreaInfo();
        updateLatestAreaInfo();
        updateSubscriptionStatus();
        updateSubscriptionStatus();
+2 −0
Original line number Original line Diff line number Diff line
@@ -162,6 +162,8 @@ public class SimStatusDialogControllerTest {
        doReturn(null).when(mSignalStrength).getCellSignalStrengths();
        doReturn(null).when(mSignalStrength).getCellSignalStrengths();
        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
        when(mSubscriptionInfo.getSubscriptionId())
            .thenReturn(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);


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