Merge "Revert "[User Switcher] Dismiss dialog when launch"" into tm-qpr-dev

2022-06-29 07:25:35 +00:00
parent a1919e4b2d 8a5d120d73
commit bfc1787139
2 changed files with 3 additions and 2 deletions
--- 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
--- 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(