From 8514ff65eb32accd6f96ab4253007b2ce1ee7348 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Wed, 8 Jun 2022 16:24:25 +0800 Subject: [PATCH] [Setting crash] The dialog is null Add the null protection. Bug: 235267673 Test: build pass Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19 --- src/com/android/settings/sim/PreferredSimDialogFragment.java | 5 +++++ .../settings/sim/SelectSpecificDataSimDialogFragment.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/com/android/settings/sim/PreferredSimDialogFragment.java b/src/com/android/settings/sim/PreferredSimDialogFragment.java index 6b5e2b50f73..806e04b35bb 100644 --- a/src/com/android/settings/sim/PreferredSimDialogFragment.java +++ b/src/com/android/settings/sim/PreferredSimDialogFragment.java @@ -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(); diff --git a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java index 1f8417737fb..a989d520c20 100644 --- a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java +++ b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java @@ -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);