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

Commit e49ecf2d authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "After this change, we'll show the emergency notification even in... 

Merge "After this change, we'll show the emergency notification even in Airplane Mode when the user is registered for Wifi Calling." into oc-mr1-dev am: d142983a
am: 2dbb59cf

Change-Id: Ieffb4f2a7a8eebfb507817fe2a14ee5459374f4a
parents 1daad530 2dbb59cf

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;