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

Commit 8514ff65 authored Jun 08, 2022 by SongFerngWang Committed by SongFerng Wang Jun 08, 2022

[Setting crash] The dialog is null

Add the null protection.

Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19

parent e6b9e1fd

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,11 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
		return;
		}

		if (dialog == null) {
		Log.d(TAG, "Dialog is null.");
		dismiss();
		}

		final SubscriptionInfo info = getPreferredSubscription();
		if (info == null) {
		dismiss();

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,11 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
		return;
		}

		if (dialog == null) {
		Log.d(TAG, "Dialog is null.");
		dismiss();
		}

		SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();
		SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(currentDataSubInfo);