commit f378a4017cc77d45e512e2e52b26d02a20015dc7
author Brad Ebinger <breadley@google.com> Mon Jun 03 22:54:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 03 22:54:35 2019 +0000
tree ad29cee1e0b0df3a3c1ceaf7c7452a9161af639d
parent ddebdb46c29969becde91f65274a308ad1a07b81
parent ec45a2f9cc123b92c4be334817f2804431ab885c

Merge "overrideConfig API did not notify platform correctly"

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