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

Commit 9ca62b22 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev

parents 822d0994 a3b98f5d

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

+2 −1
Original line number Diff line number Diff line
@@ -84,10 +84,11 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements 
    private void updateDialog(AlertDialog dialog) {

        Log.d(TAG, "Dialog updated, dismiss status: " + mWasDismissed);



        final SubscriptionInfo info = getPreferredSubscription();

        if (mWasDismissed) {

            return;

        }



        final SubscriptionInfo info = getPreferredSubscription();

        if (info == null) {

            dismiss();

            return;

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

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ public abstract class SimDialogFragment extends InstrumentedDialogFragment imple 
        }

    }



    @Override

    public void dismiss() {

        mChangeListener.stop();

        super.dismiss();

    }



    public abstract void updateDialog();



    @Override

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

+4 −3
Original line number Diff line number Diff line
@@ -128,12 +128,13 @@ public class SimListDialogFragment extends SimDialogFragment { 
    @Override

    public void updateDialog() {

        Log.d(TAG, "Dialog updated, dismiss status: " + mWasDismissed);

        if (mWasDismissed) {

            return;

        }



        List<SubscriptionInfo> currentSubscriptions = getCurrentSubscriptions();

        if (currentSubscriptions == null) {

            if (!mWasDismissed) {

            dismiss();

            }

            return;

        }

        boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME);