commit fa1cb7b634537e219555e78fef77c1f17f1952f5
author Junda Liu <junda@google.com> Fri May 22 22:24:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 22 22:24:34 2015 +0000
tree 884d992ca4cfa7df4e23a225136db70a9176c76f
parent 63ead505949cf8300d7f577ea25d3380fb2a5e8f
parent 6b1035b3c00d4b7da5bef61d7465f6b9d5cd8e89

am 6b1035b3: Merge "Avoid duplicate carrier config change bcast." into mnc-dev

* commit '6b1035b3c00d4b7da5bef61d7465f6b9d5cd8e89':
  Avoid duplicate carrier config change bcast.

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;