Snap for 7116531 from 6ec886a0e3 to rvc-qpr3-release

Change-Id: I2feb84671d651829ba4d3e3c98ae04c11e2944e8
This commit is contained in:
android-build-team Robot
2021-02-02 00:24:23 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -228,7 +228,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
if (mSubscriptionInfo == null) {
return;
}
mTelephonyManager =
mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
mPhoneStateListener = getPhoneStateListener();
updateLatestAreaInfo();
updateSubscriptionStatus();

View File

@@ -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);