commit 95137f0fd38184dca7745dae4fd19e1258a7d6bc
author James Mattis <jmattis@google.com> Mon Apr 08 19:25:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 08 19:25:23 2019 +0000
tree c37afde8ae9a459baafcc97fd5b6f57e88c1e3ac
parent 41bc1f4c24264d8d1d3748de57bf47b4e527f55f
parent c56281c62e87f0fad6ac98772f20c1d426e2c29e

Merge "Only going to use the defaultPhone instance if it is not null."

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index b3e5b11..1ea4180 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -186,9 +186,6 @@
                         }
                     }
 
-                    if (mConfigFromDefaultApp[phoneId] == null
-                            && mConfigFromCarrierApp[phoneId] == null) break;
-
                     mConfigFromDefaultApp[phoneId] = null;
                     mConfigFromCarrierApp[phoneId] = null;
                     mServiceConnection[phoneId] = null;
@@ -586,6 +583,7 @@
             intent.putExtra(TelephonyManager.EXTRA_CARRIER_ID, getCarrierIdForPhoneId(phoneId));
         }
         intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, phoneId);
+        log("Broadcast CARRIER_CONFIG_CHANGED for phone " + phoneId);
         ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
         mHasSentConfigChange[phoneId] = true;
     }