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

2022-03-03 12:36:43 +00:00
parent 822d099412 a3b98f5d04
commit 9ca62b2290
3 changed files with 12 additions and 4 deletions
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -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();
-            }
+            dismiss();
            return;
        }
        boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME);