commit 0486bdbba59948613ef35f4b5e3300b488ac5b91
author Junda Liu <junda@google.com> Fri May 22 15:01:35 2015 -0700
committer Junda Liu <junda@google.com> Fri May 22 15:01:36 2015 -0700
tree 8280e44ff416ab415db1e833d0931dd075743a32
parent 17b0b9e0831ae2c6770ebcfc70237a4363a4625d

Avoid duplicate carrier config change bcast.

Bug: b/21311587
Change-Id: I6944a409acee837f8e2225c2791ebc4ac50a5ced

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;