commit 4bf36162e2317901c41f514f1e4057c0b8acf25c
author Ying Xu <yinxu@google.com> Mon Dec 18 23:51:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 18 23:51:16 2017 +0000
tree 5eabeab21b93b4f7748119650202aed0b91bb50b
parent 5a49a8b43a75cbef14f4d36bea5a8e88d68d32ab
parent 84c6e521f7e8ab6067712dd0c6b90312efb35f21

Merge "Set the value of KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: f025fbde93 am: 96ed54cd68
am: 84c6e521f7

Change-Id: Ifb64d6107f408958a1cbbfeb30020dd2958c7797

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 366278f..b9ad770 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -785,11 +785,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;
     }