From 9db0ca4e84fafb978120661f211a627aa7941e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Kozynski?= Date: Mon, 24 Apr 2023 16:35:17 -0400 Subject: [PATCH] Don't dismiss DetailDialog if activity is finishing If the task is released when the containing activity is finishing, do not dismiss the dialog. It will be dismissed by itself. See b/248562161. Test: dialog is dismissed Fixes: 210990128 Change-Id: I7c3a44cff6e0dab7f23205a8d454a293800af3b3 --- .../src/com/android/systemui/controls/ui/DetailDialog.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt index 3bc5d44671e52..7cbd1f53612b6 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt @@ -16,6 +16,7 @@ package com.android.systemui.controls.ui +import android.app.Activity import android.app.ActivityOptions import android.app.ActivityTaskManager import android.app.ActivityTaskManager.INVALID_TASK_ID @@ -217,6 +218,12 @@ class DetailDialog( if (!isShowing()) return taskView.release() + val isActivityFinishing = + (activityContext as? Activity)?.let { it.isFinishing || it.isDestroyed } + if (isActivityFinishing == true) { + // Don't dismiss the dialog if the activity is finishing, it will get removed + return + } super.dismiss() } }