commit 28e6b1a933da79fb94c782ccb8eff325f7263c73
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 09 20:29:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 09 20:29:34 2021 +0000
tree 4b3b2f1ba42a1561d975ca9d6f08679606991d0e
parent 7387f06c93c8cb03589f767266051c0a510af0d8
parent 304e92be5d8597e1accd2ee5593d82c9469b1710

Merge "Use a stub for config from carrier app if the app returns null." into sc-dev

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 2c31dfd..efd2f1b 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -470,7 +470,15 @@
                                             resultData.getParcelable(KEY_CONFIG_BUNDLE);
                                     saveConfigToXml(getCarrierPackageForPhoneId(phoneId), "",
                                             phoneId, carrierId, config);
-                                    mConfigFromCarrierApp[phoneId] = config;
+                                    if (config != null) {
+                                        mConfigFromCarrierApp[phoneId] = config;
+                                    } else {
+                                        logdWithLocalLog("Config from carrier app is null "
+                                                + "for phoneId " + phoneId);
+                                        // Put a stub bundle in place so that the rest of the logic
+                                        // continues smoothly.
+                                        mConfigFromCarrierApp[phoneId] = new PersistableBundle();
+                                    }
                                     sendMessage(
                                             obtainMessage(
                                                     EVENT_FETCH_CARRIER_DONE, phoneId, -1));