Merge "Fix crash when trying to dismiss dialog" am: 3023a33455 am: cea2abb795

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2229977

Change-Id: I9652db6be4ab072c0c3d5593c38ac0ff4572fe2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt

@@ -18,6 +18,7 @@ package com.android.systemui.controls.ui
 
 import android.annotation.AnyThread
 import android.annotation.MainThread
+import android.app.Activity
 import android.app.AlertDialog
 import android.app.Dialog
 import android.app.PendingIntent
@@ -119,8 +120,16 @@ class ControlActionCoordinatorImpl @Inject constructor(
     }
 
     override fun closeDialogs() {
-        dialog?.dismiss()
-        dialog = null
+        val isActivityFinishing =
+            (activityContext as? Activity)?.let { it.isFinishing || it.isDestroyed }
+        if (isActivityFinishing == true) {
+            dialog = null
+            return
+        }
+        if (dialog?.isShowing == true) {
+            dialog?.dismiss()
+            dialog = null
+        }
     }
 
     override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) {