Merge "Sync main branch with QPR branch changes"

This commit is contained in:
TreeHugger Robot
2020-11-13 21:07:05 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 9 deletions

View File

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