commit f025fbde935fbbd1416c04a72160b84f6942bf34
author Ying Xu <yinxu@google.com> Mon Dec 18 23:26:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 18 23:26:24 2017 +0000
tree bf515a766dd783ee4cb326ba64ce3f678c01422c
parent 7fae8bfd2271b38f5b73e3ef65c6ae14bd244983
parent c5e27621882e38e053c04b9b06059494ffd04bcf

Merge "Set the value of KEY_CARRIER_CONFIG_OVERRIDE_BOOL"

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index a26e3d8..df006e2 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -776,11 +776,15 @@
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
         if (SubscriptionManager.isValidPhoneId(phoneId)) {
             PersistableBundle config = mConfigFromDefaultApp[phoneId];
-            if (config != null)
+            if (config != null) {
                 retConfig.putAll(config);
+                retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+            }
             config = mConfigFromCarrierApp[phoneId];
-            if (config != null)
+            if (config != null) {
                 retConfig.putAll(config);
+                retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+            }
         }
         return retConfig;
     }