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

Merge "Update signal strength on ServiceState in service" into rvc-qpr-dev

Browse Source
This commit is contained in:
Sarah Chin
2020-11-12 18:46:40 +00:00
committed by Android (Google) Code Review
parent a759432bac 62efb18365
commit 854b1837c9
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private SubscriptionInfo mSubscriptionInfo;
private TelephonyDisplayInfo mTelephonyDisplayInfo;
private ServiceState mPreviousServiceState;
private final int mSlotIndex;
private TelephonyManager mTelephonyManager;
@@ -425,6 +426,9 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
final int state = Utils.getCombinedServiceState(serviceState);
if (!Utils.isInService(serviceState)) {
resetSignalStrength();
} else if (!Utils.isInService(mPreviousServiceState)) {
// If ServiceState changed from out of service -> in service, update signal strength.
updateSignalStrength(mTelephonyManager.getSignalStrength());
}
String serviceStateValue;
@@ -472,7 +476,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
}
ServiceState serviceState = mTelephonyManager.getServiceState();
if (serviceState == null || !Utils.isInService(serviceState)) {
if (!Utils.isInService(serviceState)) {
return;
}
@@ -755,6 +759,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
updateNetworkProvider();
updateServiceState(serviceState);
updateRoamingStatus(serviceState);
mPreviousServiceState = serviceState;
}
@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.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);
}