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

Commit 6ece9017 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

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

parents cc1f8566 edf6ec49

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