commit 1b39412904871b19b8108edca6e6f82ecb3cd098
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 19:20:29 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 19:20:29 2019 +0000
tree d021a73ff0316f64ebfeca4b4e5143b8bb368c03
parent 19e51a17fabc8ee50f372848eeb2d469dc7933e1
parent fadef5aff1c23a9a6b9e45247f786c020109e5a9

Merge "Set KEY_CARRIER_CONFIG_APPLIED_BOOL to true after loading is done" am: e172803a93 am: fadef5aff1

Change-Id: Ic16c0192a5aea02d422b41e4b26b4a7a338834b9

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index cf9d376..d451ccf 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -978,7 +978,10 @@
             PersistableBundle config = mConfigFromDefaultApp[phoneId];
             if (config != null) {
                 retConfig.putAll(config);
-                retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+                if (getCarrierPackageForPhoneId(phoneId) == null) {
+                    retConfig.putBoolean(
+                            CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+                }
             }
             config = mConfigFromCarrierApp[phoneId];
             if (config != null) {
@@ -993,7 +996,6 @@
             config = mOverrideConfigs[phoneId];
             if (config != null) {
                 retConfig.putAll(config);
-                retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
             }
         }
         return retConfig;