Merge "Disable satellite when powering off cellular radio modem" into main (f334ca85) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ import com.android.internal.telephony.metrics.RadioPowerStateStats;
		import com.android.internal.telephony.metrics.ServiceStateStats;
		import com.android.internal.telephony.metrics.TelephonyMetrics;
		import com.android.internal.telephony.satellite.NtnCapabilityResolver;
		import com.android.internal.telephony.satellite.SatelliteController;
		import com.android.internal.telephony.subscription.SubscriptionInfoInternal;
		import com.android.internal.telephony.subscription.SubscriptionManagerService;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
		@@ -4971,6 +4972,7 @@ public class ServiceStateTracker extends Handler {
		*/
		public void powerOffRadioSafely() {
		synchronized (this) {
		SatelliteController.getInstance().onCellularRadioPowerOffRequested();
		if (!mPendingRadioPowerOffAfterDataOff) {
		// hang up all active voice calls first
		if (mPhone.isPhoneTypeGsm() && mPhone.isInCall()) {
		@@ -5056,7 +5058,6 @@ public class ServiceStateTracker extends Handler {
		}

		mCi.setRadioPower(false, obtainMessage(EVENT_RADIO_POWER_OFF_DONE));

		}

		/** Cancel a pending (if any) pollState() operation */

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

+22 −23

Original line number	Diff line number	Diff line
		@@ -1038,29 +1038,7 @@ public class SatelliteController extends Handler {
		}

		case EVENT_RADIO_STATE_CHANGED: {
		if (mCi.getRadioState() == TelephonyManager.RADIO_POWER_OFF
		\|\| mCi.getRadioState() == TelephonyManager.RADIO_POWER_UNAVAILABLE) {
		mIsRadioOn = false;
		logd("Radio State Changed to " + mCi.getRadioState());
		if (isSatelliteEnabled()) {
		IIntegerConsumer errorCallback = new IIntegerConsumer.Stub() {
		@Override
		public void accept(int result) {
		logd("RequestSatelliteEnabled: result=" + result);
		}
		};
		Phone phone = SatelliteServiceUtils.getPhone();
		Consumer<Integer> result = FunctionalUtils
		.ignoreRemoteException(errorCallback::accept);
		RequestSatelliteEnabledArgument message =
		new RequestSatelliteEnabledArgument(false, false, result);
		request = new SatelliteControllerHandlerRequest(message, phone);
		handleSatelliteEnabled(request);
		} else {
		logd("EVENT_RADIO_STATE_CHANGED: Satellite modem is currently disabled."
		+ " Ignored the event");
		}
		} else {
		if (mCi.getRadioState() == TelephonyManager.RADIO_POWER_ON) {
		mIsRadioOn = true;
		if (!mSatelliteModemInterface.isSatelliteServiceSupported()) {
		synchronized (mIsSatelliteSupportedLock) {
		@@ -2097,6 +2075,27 @@ public class SatelliteController extends Handler {
		}
		}

		/**
		* This function is used by {@link com.android.internal.telephony.ServiceStateTracker} to notify
		* {@link SatelliteController} that it has received a request to power off the cellular radio
		* modem. {@link SatelliteController} will then power off the satellite modem.
		*/
		public void onCellularRadioPowerOffRequested() {
		if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
		return;
		}

		mIsRadioOn = false;
		requestSatelliteEnabled(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
		false /* enableSatellite /, false / enableDemoMode */,
		new IIntegerConsumer.Stub() {
		@Override
		public void accept(int result) {
		logd("onRadioPowerOffRequested: requestSatelliteEnabled result=" + result);
		}
		});
		}

		/**
		* @return {@code true} is satellite is supported on the device, {@code false} otherwise.
		*/

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import static org.mockito.Matchers.nullable;
		import static org.mockito.Mockito.anyInt;
		import static org.mockito.Mockito.anyString;
		import static org.mockito.Mockito.atLeast;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.eq;
		import static org.mockito.Mockito.never;
		@@ -511,18 +512,22 @@ public class ServiceStateTrackerTest extends TelephonyTest {
		}

		private void testSetRadioPowerForReason(int reason) {
		clearInvocations(mSatelliteController);
		// Radio does not turn on if off for other reason and not emergency call.
		assertTrue(mSimulatedCommands.getRadioState() == TelephonyManager.RADIO_POWER_ON);
		assertTrue(sst.getRadioPowerOffReasons().isEmpty());
		sst.setRadioPowerForReason(false, false, false, false, reason);
		assertTrue(sst.getRadioPowerOffReasons().contains(reason));
		assertTrue(sst.getRadioPowerOffReasons().size() == 1);
		verify(mSatelliteController).onCellularRadioPowerOffRequested();
		clearInvocations(mSatelliteController);
		waitForLastHandlerAction(mSSTTestHandler.getThreadHandler());
		assertTrue(mSimulatedCommands.getRadioState() == TelephonyManager.RADIO_POWER_OFF);
		sst.setRadioPowerForReason(true, false, false, false,
		TelephonyManager.RADIO_POWER_REASON_USER);
		assertTrue(sst.getRadioPowerOffReasons().contains(reason));
		assertTrue(sst.getRadioPowerOffReasons().size() == 1);
		verify(mSatelliteController, never()).onCellularRadioPowerOffRequested();
		waitForLastHandlerAction(mSSTTestHandler.getThreadHandler());
		assertTrue(mSimulatedCommands.getRadioState() == TelephonyManager.RADIO_POWER_OFF);

		@@ -530,6 +535,7 @@ public class ServiceStateTrackerTest extends TelephonyTest {
		// had been turned off for.
		sst.setRadioPowerForReason(true, false, false, false, reason);
		assertTrue(sst.getRadioPowerOffReasons().isEmpty());
		verify(mSatelliteController, never()).onCellularRadioPowerOffRequested();
		waitForLastHandlerAction(mSSTTestHandler.getThreadHandler());
		assertTrue(mSimulatedCommands.getRadioState() == TelephonyManager.RADIO_POWER_ON);

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled = false;
		setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_SUCCESS);
		setRadioPower(false);
		mSatelliteControllerUT.onCellularRadioPowerOffRequested();
		processAllMessages();
		sendSatelliteModemStateChangedEvent(SATELLITE_MODEM_STATE_OFF, null);
		processAllMessages();
		@@ -847,6 +848,14 @@ public class SatelliteControllerTest extends TelephonyTest {
		assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
		assertEquals(SATELLITE_RESULT_NO_RESOURCES, (long) mIIntegerConsumerResults.get(1));
		mSatelliteControllerUT.allRadiosDisabled = true;

		resetSatelliteControllerUTToOnAndProvisionedState();
		when(mFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(false);
		mSatelliteControllerUT.onCellularRadioPowerOffRequested();
		processAllMessages();
		// Satellite should not be powered off since the feature flag oemEnabledSatelliteFlag is
		// disabled
		verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
		}

		@Test