From 8a5d120d7329034385d26b0a9d27694a10f9334d Mon Sep 17 00:00:00 2001 From: Norman Cheung Date: Tue, 28 Jun 2022 21:35:19 +0000 Subject: [PATCH] Revert "[User Switcher] Dismiss dialog when launch" This reverts commit cbbef45daf98f0b783984c2270b836dd5aaab806. Reason for revert: b/237424596 Change-Id: I601f2ad4d40ca9b379cb757d033641fce5fa2819 --- .../android/systemui/qs/user/UserSwitchDialogController.kt | 4 +++- .../systemui/qs/user/UserSwitchDialogControllerTest.kt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt index 75bf18953bf1b..260a3714a368d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt @@ -95,7 +95,9 @@ class UserSwitchDialogController @VisibleForTesting constructor( getButton(BUTTON_NEUTRAL) ) - dismiss() + if (controller == null) { + dismiss() + } activityStarter.postStartActivityDismissingKeyguard( USER_SETTINGS_INTENT, 0, controller diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt index aad03e25de609..9d908fdfb9766 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt @@ -139,7 +139,6 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { `when`(dialog.getButton(DialogInterface.BUTTON_NEUTRAL)).thenReturn(neutralButton) clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL) - verify(dialog).dismiss() verify(activityStarter) .postStartActivityDismissingKeyguard(