commit 6ece9017016a5f1a267c5a39092d2fa9c6de2c86
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Mar 12 03:52:28 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 12 03:52:28 2024 +0000
tree 04574dc59becde30cd0059f89ab9fbc6477158a8
parent cc1f856602b1beae57614b7a8e8e600c3262397b
parent edf6ec495542217b09a0b77e522470691e9e9a30

Merge "Fix crash on potentially missing CarrierConfigManager [SettingsLib]" into main

packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
index 840c936..b7108c9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
+++ b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
@@ -236,7 +236,8 @@
             // Handle specific carrier config values for the default data SIM
             int defaultDataSubId = SubscriptionManager.from(context)
                     .getDefaultDataSubscriptionId();
-            PersistableBundle b = configMgr.getConfigForSubId(defaultDataSubId);
+            PersistableBundle b = configMgr == null ? null
+                        : configMgr.getConfigForSubId(defaultDataSubId);
             if (b != null) {
                 config.alwaysShowDataRatIcon = b.getBoolean(
                         CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);