commit 725edf64f5e89cbf55cf744830a92c78cd40f3ed
author Brad Ebinger <breadley@google.com> Wed May 15 18:24:13 2019 -0700
committer Brad Ebinger <breadley@google.com> Thu May 16 01:27:33 2019 +0000
tree 93a2079c106faffd25794c0e23b1b6d1ad3d1330
parent 6622af416dc2d4c144d8493ddae28a1823f3f950

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
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 e2e30ec..ed95a2c 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -944,10 +944,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);