commit 0c1d8841604e80ae5f5ec89d0484eff2a0e776b9
author Jack Yu <jackyu@google.com> Sat Apr 06 00:37:23 2019 -0700
committer Jack Yu <jackyu@google.com> Sun Apr 07 23:45:21 2019 -0700
tree 1d519e9adb9b6d7eb8aa7b5cf511e9c33bf57fb1
parent 6a0ca20c6cd4b6b708303c418fd53c0f8aaafbe7

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

Merged-In: Ibab66a8b7827846806eaef02d7e12d384b1ef2da
Change-Id: Ibab66a8b7827846806eaef02d7e12d384b1ef2da
(cherry picked from commit f1661321807b66e773dc3857eb963ee46944bab3)

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;
     }