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

Commit 56c409e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add carrier connected check before cleanup satellite resources" into main

parents 19b9d763 5336fbf0

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());