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

Commit c2739f75 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android Build Coastguard Worker
Browse files

Check mEmergencyConnection before starting e911 timer. 

Bug: 347170852
Test: b/348385869
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ee454d90f7d90c0c2ce6234d43c111f784947c9b)
Merged-In: If506044f3bacc5e5b52b6990aa5bc4115515670d
Change-Id: If506044f3bacc5e5b52b6990aa5bc4115515670d
parent 4abf4ac9

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

+3 −4
Original line number Diff line number Diff line
@@ -251,10 +251,11 @@ public class SatelliteSOSMessageRecommender extends Handler { 


        selectEmergencyCallWaitForConnectionTimeoutDuration();

        if (mEmergencyConnection == null) {

            handleStateChangedEventForHysteresisTimer();

            registerForInterestedStateChangedEvents();

        }

        mEmergencyConnection = connection;

        handleStateChangedEventForHysteresisTimer();



        synchronized (mLock) {

            mCheckingAccessRestrictionInProgress = false;

            mIsSatelliteAllowedForCurrentLocation = false;
@@ -413,7 +414,6 @@ public class SatelliteSOSMessageRecommender extends Handler { 
        for (Phone phone : PhoneFactory.getPhones()) {

            phone.registerForServiceStateChanged(

                    this, EVENT_SERVICE_STATE_CHANGED, null);

            registerForImsRegistrationStateChanged(phone);

        }

    }
@@ -433,7 +433,6 @@ public class SatelliteSOSMessageRecommender extends Handler { 
                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, mISatelliteProvisionStateCallback);

        for (Phone phone : PhoneFactory.getPhones()) {

            phone.unregisterForServiceStateChanged(this);

            unregisterForImsRegistrationStateChanged(phone);

        }

    }
@@ -525,7 +524,7 @@ public class SatelliteSOSMessageRecommender extends Handler { 
    }



    private synchronized void handleStateChangedEventForHysteresisTimer() {

        if (!isCellularAvailable()) {

        if (!isCellularAvailable() && mEmergencyConnection != null) {

            startTimer();

        } else {

            logv("handleStateChangedEventForHysteresisTimer stopTimer");

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

+62 −93

File changed.

Preview size limit exceeded, changes collapsed.