diff options
| author | pkanwar <pkanwar@google.com> | 2017-09-27 16:16:45 -0700 |
|---|---|---|
| committer | pkanwar <pkanwar@google.com> | 2017-09-27 17:24:15 -0700 |
| commit | ebb5717eed7380442f7c32a377aeae597d1f2a90 (patch) | |
| tree | 3f1f0eee9eb89aec68a45248551ad6987109ddf7 | |
| parent | aba07fa1ac55d4f2866409f6c6bb85b66b8b3251 (diff) | |
| download | telephony-ebb5717eed7380442f7c32a377aeae597d1f2a90.tar.gz | |
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
| -rw-r--r-- | src/java/com/android/internal/telephony/CarrierServiceStateTracker.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java index 8df201e583..77a39eb902 100644 --- a/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/CarrierServiceStateTracker.java @@ -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; |