commit 304e92be5d8597e1accd2ee5593d82c9469b1710
author Amit Mahajan <amitmahajan@google.com> Thu Apr 08 14:03:30 2021 -0700
committer Amit Mahajan <amitmahajan@google.com> Thu Apr 08 21:08:03 2021 +0000
tree 2c8ebb2c473595da746cb97edc36f7e5bed2d3c8
parent 6f0781faec41033c7b4ae9bac6681ffad37f7054

Use a stub for config from carrier app if the app returns null.

Generally a carrier app should not return config as null. However
if it does it should be handled gracefully by the platform.

Test: manual
Bug: 179641392
Change-Id: Iaa2a105ea516c6fec835c2e69022ae955b364496

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 4ff7316..785095a 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -463,7 +463,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));