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" am: 3023a33455 am: cea2abb795

Browse Source 
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>
This commit is contained in:
Jernej Virag
2022-09-27 08:46:25 +00:00
committed by Automerger Merge Worker
parent 6fc2500747 cea2abb795
commit 68642fbca7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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
@@ -119,9 +120,17 @@ class ControlActionCoordinatorImpl @Inject constructor(
} }
override fun closeDialogs() { override fun closeDialogs() {
val isActivityFinishing =
(activityContext as? Activity)?.let { it.isFinishing || it.isDestroyed }
if (isActivityFinishing == true) {
dialog = null
return
}
if (dialog?.isShowing == true) {
dialog?.dismiss() dialog?.dismiss()
dialog = null dialog = null
} }
}
override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) { override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) {
controlsMetricsLogger.touch(cvh, isLocked) controlsMetricsLogger.touch(cvh, isLocked)