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

Commit d65110a8 authored Apr 14, 2022 by SongFerngWang Committed by Automerger Merge Worker Apr 14, 2022

Fix the settings crash when SimDialogActivity is null am: d786b64f am: a800c05a

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

Change-Id: Id6de8ec6e269fc6720c57ee04bd2e26d90293ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 56f8390f a800c05a

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