Merge "Update signal strength on ServiceState in service"
This commit is contained in:
@@ -140,6 +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 final int mSlotIndex;
|
private final int mSlotIndex;
|
||||||
private TelephonyManager mTelephonyManager;
|
private TelephonyManager mTelephonyManager;
|
||||||
@@ -437,6 +438,9 @@ 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)) {
|
||||||
|
// If ServiceState changed from out of service -> in service, update signal strength.
|
||||||
|
updateSignalStrength(mTelephonyManager.getSignalStrength());
|
||||||
}
|
}
|
||||||
|
|
||||||
String serviceStateValue;
|
String serviceStateValue;
|
||||||
@@ -484,7 +488,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
|
|||||||
}
|
}
|
||||||
|
|
||||||
ServiceState serviceState = mTelephonyManager.getServiceState();
|
ServiceState serviceState = mTelephonyManager.getServiceState();
|
||||||
if (serviceState == null || !Utils.isInService(serviceState)) {
|
if (!Utils.isInService(serviceState)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -767,6 +771,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
|
|||||||
updateNetworkProvider();
|
updateNetworkProvider();
|
||||||
updateServiceState(serviceState);
|
updateServiceState(serviceState);
|
||||||
updateRoamingStatus(serviceState);
|
updateRoamingStatus(serviceState);
|
||||||
|
mServiceState = serviceState;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user