Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290

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

Change-Id: I11a7df9bad11d3324ff62e4710ce050ca4275e3a

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

@@ -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

@@ -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

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