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

Commit ebb5717e authored by pkanwar's avatar pkanwar
Browse files

After this change, we'll show the emergency notification even in Airplane Mode 

when the user is registered for Wifi Calling.

Bug: 65692603
Test: manual
Change-Id: Ifec15a871217cda8c0d87ae5eaee2c48b00f9ea2
parent aba07fa1

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

+2 −7
Original line number Diff line number Diff line
@@ -79,13 +79,8 @@ public class CarrierServiceStateTracker extends Handler { 
        switch (msg.what) {

            case CARRIER_EVENT_VOICE_REGISTRATION:

            case CARRIER_EVENT_DATA_REGISTRATION:

                handleConfigChanges();

                break;

            case CARRIER_EVENT_VOICE_DEREGISTRATION:

            case CARRIER_EVENT_DATA_DEREGISTRATION:

                if (isRadioOffOrAirplaneMode()) {

                    break;

                }

                handleConfigChanges();

                break;

            case NOTIFICATION_EMERGENCY_NETWORK:
@@ -317,8 +312,8 @@ public class CarrierServiceStateTracker extends Handler { 
            Rlog.i(LOG_TAG, "PrefNetworkNotification: sendMessage() w/values: "

                    + "," + isPhoneStillRegistered() + "," + mDelay + "," + isGlobalMode()

                    + "," + mSST.isRadioOn());

            if (mDelay == UNINITIALIZED_DELAY_VALUE ||  isPhoneStillRegistered()

                    || isGlobalMode()) {

            if (mDelay == UNINITIALIZED_DELAY_VALUE ||  isPhoneStillRegistered() || isGlobalMode()

                    || isRadioOffOrAirplaneMode()) {

                return false;

            }

            return true;