commit c5e27621882e38e053c04b9b06059494ffd04bcf
author yinxu <yinxu@google.com> Wed Nov 29 15:08:50 2017 -0800
committer yinxu <yinxu@google.com> Tue Dec 12 12:29:03 2017 -0800
tree ea3f57d44c4007939996c352cf7c61ac0c1a1afd
parent 60435c90bdb568608425951239f0332218dfb4a5

Set the value of KEY_CARRIER_CONFIG_OVERRIDE_BOOL

Whenever the carrier config bundle is requested by the user, the value
of key KEY_CARRIER_CONFIG_OVERRIDE_BOOL should be set according to
whether the config has been overridden.

Bug: 70400384
Test: Basic telephony sanity
Change-Id: I6487f3255b69321b6b7d16813de622aef22acda9

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