commit 52119cd64474c40204315e9a979f45b871104fde
author Sooraj Sasindran <sasindran@google.com> Mon Oct 23 16:24:28 2017 -0700
committer Sooraj Sasindran <sasindran@google.com> Tue Oct 24 03:27:32 2017 +0000
tree ecc99822f5d37a7cb680a976d3fa7f91e058ba57
parent fb9d621823d8f68d3e8e7b543be23506ba6a2e7e

Ignore clear config if shutdown

Ignore clear config request if device
is being shutdown

Test: verified that there is not IMS turn off
during shutdown
Bug:65749654
Merged-In: If9da197ffee10f395ea73561400644d6765be1e1
Change-Id: If9da197ffee10f395ea73561400644d6765be1e1

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index a26e3d8..2114ad8 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -169,8 +169,17 @@
             switch (msg.what) {
                 case EVENT_CLEAR_CONFIG:
                 {
+                    /* Ignore clear configuration request if device is being shutdown. */
+                    Phone phone = PhoneFactory.getPhone(phoneId);
+                    if (phone != null) {
+                        if (phone.isShuttingDown()) {
+                            break;
+                        }
+                    }
+
                     if (mConfigFromDefaultApp[phoneId] == null
                             && mConfigFromCarrierApp[phoneId] == null) break;
+
                     mConfigFromDefaultApp[phoneId] = null;
                     mConfigFromCarrierApp[phoneId] = null;
                     mServiceConnection[phoneId] = null;