commit ec45a2f9cc123b92c4be334817f2804431ab885c
author Brad Ebinger <breadley@google.com> Wed May 15 18:24:13 2019 -0700
committer Brad Ebinger <breadley@google.com> Wed May 22 00:28:31 2019 +0000
tree 868c819ce5da3e2529f15a86090e2a19f3a655cc
parent 67854706e28952495169220e7ed94aee402df14f

overrideConfig API did not notify platform correctly

In the case when overrideConfig was being passed null
to remove any overrides, it was not notifying the system
of the change.

Bug: 131614858
Test: atest GtsTelephonyTestCases
Merged-In: I0f9445dcc22d8383608191cf56630beb5c7b0726
Change-Id: I7e0342c5b2edb9c3f4b0547c424233a4f73733f2

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 8299d86..da478fa 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -935,10 +935,7 @@
 
         if (overrides == null) {
             mOverrideConfigs[phoneId] = new PersistableBundle();
-            return;
-        }
-
-        if (mOverrideConfigs[phoneId] == null) {
+        } else if (mOverrideConfigs[phoneId] == null) {
             mOverrideConfigs[phoneId] = overrides;
         } else {
             mOverrideConfigs[phoneId].putAll(overrides);