commit f1661321807b66e773dc3857eb963ee46944bab3
author Jack Yu <jackyu@google.com> Sat Apr 06 00:37:23 2019 -0700
committer Jack Yu <jackyu@google.com> Sat Apr 06 00:37:23 2019 -0700
tree 510776fba84ce0de0e81c189964774d9b3f04f3b
parent c2d913fb0bb1a61593c4a59e5b1077d95416ad47

Fixed that carrier config changed event not sent

Fixed that carrier config changed event not sent when
device boot up with SIM absent.

Bug: 130060654
Test: Manual
Change-Id: Ibab66a8b7827846806eaef02d7e12d384b1ef2da

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 061efef..aa1b8fa 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -181,9 +181,6 @@
                         }
                     }
 
-                    if (mConfigFromDefaultApp[phoneId] == null
-                            && mConfigFromCarrierApp[phoneId] == null) break;
-
                     mConfigFromDefaultApp[phoneId] = null;
                     mConfigFromCarrierApp[phoneId] = null;
                     mServiceConnection[phoneId] = null;
@@ -554,6 +551,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;
     }