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