PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync main branch with QPR branch changes

Browse Source 
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
This commit is contained in:
Sarah Chin
2020-11-12 15:58:43 -08:00
parent 38528b02a8
commit 396934a092
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -140,7 +140,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private SubscriptionInfo mSubscriptionInfo; private SubscriptionInfo mSubscriptionInfo;
private TelephonyDisplayInfo mTelephonyDisplayInfo; private TelephonyDisplayInfo mTelephonyDisplayInfo;
private ServiceState mServiceState; private ServiceState mPreviousServiceState;
private final int mSlotIndex; private final int mSlotIndex;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
@@ -438,7 +438,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
final int state = Utils.getCombinedServiceState(serviceState); final int state = Utils.getCombinedServiceState(serviceState);
if (!Utils.isInService(serviceState)) { if (!Utils.isInService(serviceState)) {
resetSignalStrength(); 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. // If ServiceState changed from out of service -> in service, update signal strength.
updateSignalStrength(mTelephonyManager.getSignalStrength()); updateSignalStrength(mTelephonyManager.getSignalStrength());
} }
@@ -771,7 +771,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
updateNetworkProvider(); updateNetworkProvider();
updateServiceState(serviceState); updateServiceState(serviceState);
updateRoamingStatus(serviceState); updateRoamingStatus(serviceState);
mServiceState = serviceState; mPreviousServiceState = serviceState;
} }
@Override @Override

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

@@ -42,6 +42,7 @@ import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
@@ -293,7 +294,7 @@ public class SimStatusDialogControllerTest {
final String signalStrengthString = final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); 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 @Test
@@ -310,7 +311,7 @@ public class SimStatusDialogControllerTest {
final String signalStrengthString = final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); 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 @Test
@@ -330,7 +331,7 @@ public class SimStatusDialogControllerTest {
final String signalStrengthString = final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu); 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 @Test
@@ -394,8 +395,8 @@ public class SimStatusDialogControllerTest {
mController.initialize(); mController.initialize();
verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID); verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID); verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
} }
@Test @Test
@@ -405,7 +406,7 @@ public class SimStatusDialogControllerTest {
mController.initialize(); 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_LABEL_ID);
verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID); verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
} }