Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edf6ec49 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Fix crash on potentially missing CarrierConfigManager [SettingsLib] 

Bug: 310710841
Test: it builds and boots
Change-Id: I1f72c737f9f122e3781942db221731ef56c015da
parent 3a9e332a

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

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ public class MobileMappings { 
            // 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);