Merge "Update signal strength on ServiceState in service" (c47b64cd) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O

		private SubscriptionInfo mSubscriptionInfo;
		private TelephonyDisplayInfo mTelephonyDisplayInfo;
		private ServiceState mServiceState;

		private final int mSlotIndex;
		private TelephonyManager mTelephonyManager;
		@@ -437,6 +438,9 @@ 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)) {
		// If ServiceState changed from out of service -> in service, update signal strength.
		updateSignalStrength(mTelephonyManager.getSignalStrength());
		}

		String serviceStateValue;
		@@ -484,7 +488,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
		}

		ServiceState serviceState = mTelephonyManager.getServiceState();
		if (serviceState == null \|\| !Utils.isInService(serviceState)) {
		if (!Utils.isInService(serviceState)) {
		return;
		}

		@@ -767,6 +771,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
		updateNetworkProvider();
		updateServiceState(serviceState);
		updateRoamingStatus(serviceState);
		mServiceState = serviceState;
		}

		@Override