commit 52e05ac8764f3f4c08a74c2be75fcc9c6aa1698e
author Brad Ebinger <breadley@google.com> Mon May 20 23:21:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 20 23:21:54 2019 +0000
tree 7da91d2d227b0ff98821ee3eb69fc96b164d2d39
parent 7bcfb8e0c4efa1a3ede770466a95423735289f4a
parent 725edf64f5e89cbf55cf744830a92c78cd40f3ed

Merge "overrideConfig API did not notify platform correctly" into qt-dev

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