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

Commit 71791ad2 authored by Stuart Scott's avatar Stuart Scott Committed by Android (Google) Code Review
Browse files

Merge "Add null pointer check"

parents 60a09ea2 9302830f

src/com/android/settings/ResetNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class ResetNetwork extends Fragment { 
        mSubscriptionSpinner = (Spinner) mContentView.findViewById(R.id.reset_network_subscription);



        mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();

        if (mSubscriptions.size() > 0) {

        if (mSubscriptions != null && mSubscriptions.size() > 0) {

            // Get the default subscription in the order of data, voice, sms, first up.

            int defaultSubscription = SubscriptionManager.getDefaultDataSubId();

            if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {