Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5336fbf0 authored Nov 27, 2024 by Sangyun Yun

Add carrier connected check before cleanup satellite resources

Bug: 380387958
Test: Manally tested Satellite
FLAG: EXEMPT bugfix
Change-Id: I83e29e059cb6f80d4a8c644996d57b1cf75fbd7b

parent afdab527

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -307,7 +307,8 @@ public class SatelliteSOSMessageRecommender extends Handler {
		}

		private void handleSatelliteProvisionStateChangedEvent(boolean provisioned) {
		if (!provisioned) {
		if (!provisioned
		&& !isSatelliteConnectedViaCarrierWithinHysteresisTime()) {
		cleanUpResources(false);
		}
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -373,6 +373,7 @@ public class SatelliteSOSMessageRecommenderTest extends TelephonyTest {

		@Test
		public void testSatelliteProvisionStateChangedBeforeTimeout() {
		mTestSatelliteController.setSatelliteConnectedViaCarrierWithinHysteresisTime(false);
		mTestSOSMessageRecommender.onEmergencyCallStarted(mTestConnection, false);
		processAllMessages();

		@@ -393,6 +394,7 @@ public class SatelliteSOSMessageRecommenderTest extends TelephonyTest {
		assertFalse(mTestSOSMessageRecommender.isDialerNotified());
		reset(mMockSatelliteStats);

		mTestSatelliteController.setSatelliteConnectedViaCarrierWithinHysteresisTime(true);
		mTestSOSMessageRecommender.onEmergencyCallStarted(mTestConnection, false);
		processAllMessages();
		assertTrue(mTestSOSMessageRecommender.isTimerStarted());