Merge "Reset carrier roaming params if service state reports radio is powered off." into main (29fef786) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -3006,8 +3006,9 @@ public class SatelliteController extends Handler {
		return true;
		}

		if (getWwanIsInService(serviceState)) {
		// Device is connected to terrestrial network which has coverage
		if (getWwanIsInService(serviceState)
		\|\| serviceState.getState() == ServiceState.STATE_POWER_OFF) {
		// Device is connected to terrestrial network which has coverage or radio is turned off
		resetCarrierRoamingSatelliteModeParams(subId);
		return false;
		}
		@@ -4528,7 +4529,8 @@ public class SatelliteController extends Handler {
		}
		} else {
		Boolean connected = mWasSatelliteConnectedViaCarrier.get(subId);
		if (getWwanIsInService(serviceState)) {
		if (getWwanIsInService(serviceState)
		\|\| serviceState.getState() == ServiceState.STATE_POWER_OFF) {
		resetCarrierRoamingSatelliteModeParams(subId);
		} else if (connected != null && connected) {
		// The device just got disconnected from a satellite network