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

Commit 09168994 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "NPE when accessing Sim Cards option with no sims."

parents 9a6750d6 da0de0dd

src/com/android/settings/sim/SimSettings.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -527,8 +527,11 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        simPref.clearItems();

        simPref.clearItems();





        //Get num of activated Subs

        //Get num of activated Subs

        if (mSubInfoList != null) {

            for (SubscriptionInfo subInfo : mSubInfoList) {

            for (SubscriptionInfo subInfo : mSubInfoList) {

            if (subInfo != null && subInfo.getStatus() == SubscriptionManager.ACTIVE) mActCount++;

                if (subInfo != null && subInfo.getStatus()

                        == SubscriptionManager.ACTIVE) mActCount++;

            }

        }

        }





        if (askFirst && mActCount > 1) {

        if (askFirst && mActCount > 1) {