commit c93a1706a7b465b83c9800498bfbc8dbfc8f8b06
author Nazanin Bakhshi <nazaninb@google.com> Wed Sep 18 17:54:01 2019 -0700
committer Malcolm Chen <refuhoo@google.com> Thu Sep 26 17:44:21 2019 -0700
tree 4ec8f0cba9f71abe84b3b56f1bf2115e3b6aac61
parent ea5394a5a9e45828340bc7cd5440ddea93aad1cc

Add a CTS test for carrier config certificates

Bug: 141026377
Test: CTS
Change-Id: I733ea1b715e7e5fc082876bbd483760c9172dcdf

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index c5b4875..c5e913c 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -566,6 +566,13 @@
             configPackagename = mPlatformCarrierConfigPackage;
             configToSend = mConfigFromDefaultApp[phoneId];
         }
+
+        // mOverrideConfigs is for testing. And it will override current configs.
+        PersistableBundle config = mOverrideConfigs[phoneId];
+        if (config != null) {
+            configToSend.putAll(config);
+        }
+
         mSubscriptionInfoUpdater.updateSubscriptionByCarrierConfigAndNotifyComplete(
                 phoneId, configPackagename, configToSend,
                 mHandler.obtainMessage(EVENT_SUBSCRIPTION_INFO_UPDATED, phoneId, -1));