From 396934a092f2379305f063b02f67882accda5e7f Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 12 Nov 2020 15:58:43 -0800 Subject: [PATCH] Sync main branch with QPR branch changes Original change (ag/13006754) was modified to merge in QPR (ag/13023201). Adding the same changes to the main branch to keep it consistent. Test: make RunSettingsRoboTests Bug: 167643728 Change-Id: Iedf14d2c2ac9181c9aad0ed929b19ffeb60560b2 --- .../simstatus/SimStatusDialogController.java | 6 +++--- .../simstatus/SimStatusDialogControllerTest.java | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index e3f217dba3a..10409fcd346 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -140,7 +140,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O private SubscriptionInfo mSubscriptionInfo; private TelephonyDisplayInfo mTelephonyDisplayInfo; - private ServiceState mServiceState; + private ServiceState mPreviousServiceState; private final int mSlotIndex; private TelephonyManager mTelephonyManager; @@ -438,7 +438,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O final int state = Utils.getCombinedServiceState(serviceState); if (!Utils.isInService(serviceState)) { resetSignalStrength(); - } else if (mServiceState != null && !Utils.isInService(mServiceState)) { + } else if (!Utils.isInService(mPreviousServiceState)) { // If ServiceState changed from out of service -> in service, update signal strength. updateSignalStrength(mTelephonyManager.getSignalStrength()); } @@ -771,7 +771,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O updateNetworkProvider(); updateServiceState(serviceState); updateRoamingStatus(serviceState); - mServiceState = serviceState; + mPreviousServiceState = serviceState; } @Override diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index bbab2592707..a854c04ec2b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -42,6 +42,7 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; @@ -293,7 +294,7 @@ public class SimStatusDialogControllerTest { final String signalStrengthString = mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); - verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); + verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); } @Test @@ -310,7 +311,7 @@ public class SimStatusDialogControllerTest { final String signalStrengthString = mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); - verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); + verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); } @Test @@ -330,7 +331,7 @@ public class SimStatusDialogControllerTest { final String signalStrengthString = mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); - verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); + verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); } @Test @@ -394,8 +395,8 @@ public class SimStatusDialogControllerTest { mController.initialize(); - verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID); - verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID); + verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID); + verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID); } @Test @@ -405,7 +406,7 @@ public class SimStatusDialogControllerTest { mController.initialize(); - verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any()); + verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any()); verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID); verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID); }