Merge "Combine isSatelliteEnabled and isSatelliteBeingEnabled" into main (8a5b42bd) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/MultiSimSettingController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -513,8 +513,8 @@ public class MultiSimSettingController extends Handler {
		SatelliteController satelliteController = SatelliteController.getInstance();
		boolean isSatelliteEnabledOrBeingEnabled = false;
		if (satelliteController != null) {
		isSatelliteEnabledOrBeingEnabled = satelliteController.isSatelliteEnabled()
		\|\| satelliteController.isSatelliteBeingEnabled();
		isSatelliteEnabledOrBeingEnabled =
		satelliteController.isSatelliteEnabledOrBeingEnabled();
		}

		if (DBG) {

src/java/com/android/internal/telephony/emergency/EmergencyStateTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1588,7 +1588,7 @@ public class EmergencyStateTracker {
		final boolean isAirplaneModeOn = isAirplaneModeOn(mContext);
		boolean needToTurnOnRadio = !isRadioOn() \|\| isAirplaneModeOn;
		final SatelliteController satelliteController = SatelliteController.getInstance();
		boolean needToTurnOffSatellite = satelliteController.isSatelliteEnabled();
		boolean needToTurnOffSatellite = satelliteController.isSatelliteEnabledOrBeingEnabled();

		if (isAirplaneModeOn && !isPowerOff()
		&& !phone.getServiceStateTracker().getDesiredPowerState()) {
		@@ -1614,7 +1614,7 @@ public class EmergencyStateTracker {
		@Override
		public void onComplete(RadioOnStateListener listener, boolean isRadioReady) {
		if (!isRadioReady) {
		if (satelliteController.isSatelliteEnabled()) {
		if (satelliteController.isSatelliteEnabledOrBeingEnabled()) {
		// Could not turn satellite off
		Rlog.e(TAG, "Failed to turn off satellite modem.");
		completeEmergencyMode(emergencyType, DisconnectCause.SATELLITE_ENABLED);
		@@ -1647,7 +1647,7 @@ public class EmergencyStateTracker {
		return false;
		}
		return phone.getServiceStateTracker().isRadioOn()
		&& !satelliteController.isSatelliteEnabled();
		&& !satelliteController.isSatelliteEnabledOrBeingEnabled();
		}

		@Override
		@@ -1659,7 +1659,7 @@ public class EmergencyStateTracker {
		}
		// onTimeout shall be called only with the Phone for emergency
		return phone.getServiceStateTracker().isRadioOn()
		&& !satelliteController.isSatelliteEnabled();
		&& !satelliteController.isSatelliteEnabledOrBeingEnabled();
		}
		}, !isTestEmergencyNumber, phone, isTestEmergencyNumber, waitForInServiceTimeout,
		/* forNormalRoutingEmergencyCall */ false);

src/java/com/android/internal/telephony/emergency/RadioOnHelper.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -104,11 +104,8 @@ public class RadioOnHelper implements RadioOnStateListener.Callback {
		}
		powerOnRadio(forEmergencyCall, phoneForEmergencyCall, isTestEmergencyNumber,
		forNormalRoutingEmergencyCall);
		if (SatelliteController.getInstance().isSatelliteEnabled()
		\|\| SatelliteController.getInstance().isSatelliteBeingEnabled()) {
		// TODO: phoneForEmergencyCall is actually ignored, SatelliteController#mSatelliePhone
		// is being used instead.
		powerOffSatellite(phoneForEmergencyCall);
		if (SatelliteController.getInstance().isSatelliteEnabledOrBeingEnabled()) {
		powerOffSatellite();
		}
		}

		@@ -162,7 +159,7 @@ public class RadioOnHelper implements RadioOnStateListener.Callback {
		* Attempt to power off the satellite modem. We'll eventually get an
		* onSatelliteModemStateChanged() callback when the satellite modem is successfully disabled.
		*/
		private void powerOffSatellite(Phone phoneForEmergencyCall) {
		private void powerOffSatellite() {
		SatelliteController satelliteController = SatelliteController.getInstance();
		satelliteController.requestSatelliteEnabled(
		false /* enableSatellite /, false / enableDemoMode /, false / isEmergency */,

src/java/com/android/internal/telephony/emergency/RadioOnStateListener.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ public class RadioOnStateListener {
		// Register for RADIO_OFF to handle cases where emergency call is dialed before
		// we receive UNSOL_RESPONSE_RADIO_STATE_CHANGED with RADIO_OFF.
		registerForRadioOff();
		if (mSatelliteController.isSatelliteEnabled()) {
		if (mSatelliteController.isSatelliteEnabledOrBeingEnabled()) {
		// Register for satellite modem state changed to notify when satellite is disabled.
		registerForSatelliteEnabledChanged();
		}
		@@ -401,7 +401,7 @@ public class RadioOnStateListener {
		Rlog.d(TAG, "Trying (again) to turn the radio on and satellite modem off.");
		mPhone.setRadioPower(true, mForEmergencyCall, mSelectedPhoneForEmergencyCall,
		false);
		if (mSatelliteController.isSatelliteEnabled()) {
		if (mSatelliteController.isSatelliteEnabledOrBeingEnabled()) {
		mSatelliteController.requestSatelliteEnabled(
		false /* enableSatellite /, false / enableDemoMode */,
		false /* isEmergency*/,

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

+20 −7

Original line number	Diff line number	Diff line
		@@ -2094,21 +2094,23 @@ public class SatelliteController extends Handler {
		*
		* @return {@code true} if the satellite modem is enabled and {@code false} otherwise.
		*/
		public boolean isSatelliteEnabled() {
		private boolean isSatelliteEnabled() {
		if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
		plogd("isSatelliteEnabled: oemEnabledSatelliteFlag is disabled");
		return false;
		}
		synchronized (mIsSatelliteEnabledLock) {
		if (mIsSatelliteEnabled == null) return false;
		return mIsSatelliteEnabled;
		}
		}

		/**
		* Get whether satellite modem is being enabled.
		*
		* @return {@code true} if the satellite modem is being enabled and {@code false} otherwise.
		*/
		public boolean isSatelliteBeingEnabled() {
		private boolean isSatelliteBeingEnabled() {
		if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
		plogd("isSatelliteBeingEnabled: oemEnabledSatelliteFlag is disabled");
		return false;
		@@ -2120,6 +2122,17 @@ public class SatelliteController extends Handler {
		return false;
		}

		/**
		* Get whether the satellite modem is enabled or being enabled.
		* This will return the cached value instead of querying the satellite modem.
		*
		* @return {@code true} if the satellite modem is enabled or being enabled, {@code false}
		* otherwise.
		*/
		public boolean isSatelliteEnabledOrBeingEnabled() {
		return isSatelliteEnabled() \|\| isSatelliteBeingEnabled();
		}

		/**
		* Get whether satellite modem is being disabled.
		*
		@@ -3502,7 +3515,7 @@ public class SatelliteController extends Handler {
		return false;
		}

		if (!isSatelliteEnabled()) {
		if (!isSatelliteEnabledOrBeingEnabled()) {
		plogd("iisInCarrierRoamingNbIotNtn: satellite is disabled");
		return false;
		}
		@@ -4139,7 +4152,7 @@ public class SatelliteController extends Handler {
		mWaitingForSatelliteModemOff = false;
		}
		} else {
		if (isSatelliteEnabled() \|\| isSatelliteBeingEnabled() \|\| isSatelliteBeingDisabled()) {
		if (isSatelliteEnabledOrBeingEnabled() \|\| isSatelliteBeingDisabled()) {
		notifyModemStateChangedToSessionController(state);
		} else {
		// Telephony framework and modem are out of sync. We need to disable modem
		@@ -5629,7 +5642,7 @@ public class SatelliteController extends Handler {
		return;
		}

		if (!isSatelliteEnabled()) {
		if (!isSatelliteEnabledOrBeingEnabled()) {
		plogd("handleCmdUpdateNtnSignalStrengthReporting: ignore request, satellite is "
		+ "disabled");
		return;