Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2022-12-08 14:58:42 +00:00
committed by Android (Google) Code Review
parent 3c86fce3a9 3588cb06ba
commit 0bfdbbf4c2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.systemui.controls.ui
import android.annotation.AnyThread import android.annotation.AnyThread
import android.annotation.MainThread import android.annotation.MainThread
import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
import android.app.Dialog import android.app.Dialog
import android.app.PendingIntent import android.app.PendingIntent
@@ -85,8 +86,16 @@ class ControlActionCoordinatorImpl @Inject constructor(
} }
override fun closeDialogs() { override fun closeDialogs() {
dialog?.dismiss() val isActivityFinishing =
dialog = null (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) { override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) {