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

Commit b9079b75 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f9865 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: I58a406731a33fd63f5555259863327e96987b37b
parents 831d0282 c09f9865

src/com/android/settings/network/SubscriptionsPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -603,7 +603,11 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
        public String getNetworkType(Context context, Config config,

                TelephonyDisplayInfo telephonyDisplayInfo, int subId) {

            String iconKey = getIconKey(telephonyDisplayInfo);

            int resId = mapIconSets(config).get(iconKey).dataContentDescription;

            MobileIconGroup iconGroup = mapIconSets(config).get(iconKey);

            int resId = 0;

            if (iconGroup != null) {

                resId = iconGroup.dataContentDescription;

            }

            return resId != 0

                    ? SubscriptionManager.getResourcesForSubId(context, subId).getString(resId)

                    : "";