commit 6b1035b3c00d4b7da5bef61d7465f6b9d5cd8e89
author Junda Liu <junda@google.com> Fri May 22 22:17:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 22 22:17:17 2015 +0000
tree 77017b968da34b3f47d07c137c74d6d0554baca6
parent 93af5a6967f72ba15ddc39600733c02dc95fc6ea
parent 0486bdbba59948613ef35f4b5e3300b488ac5b91

Merge "Avoid duplicate carrier config change bcast." into mnc-dev

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 8c22d7a..d918f7d 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -137,6 +137,9 @@
             PersistableBundle config;
             switch (msg.what) {
                 case EVENT_CLEAR_CONFIG:
+                    if (mConfigFromDefaultApp[phoneId] == null &&
+                        mConfigFromCarrierApp[phoneId] == null)
+                        break;
                     mConfigFromDefaultApp[phoneId] = null;
                     mConfigFromCarrierApp[phoneId] = null;
                     mServiceConnection[phoneId] = null;