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

2022-06-28 16:32:24 +00:00
parent fac74db147 cbbef45daf
commit 3f06dfbe17
2 changed files with 2 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt
@@ -95,9 +95,7 @@ class UserSwitchDialogController @VisibleForTesting constructor(
                        getButton(BUTTON_NEUTRAL)
                    )

-                    if (controller == null) {
-                        dismiss()
-                    }
+                    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,6 +139,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() {
        `when`(dialog.getButton(DialogInterface.BUTTON_NEUTRAL)).thenReturn(neutralButton)

        clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL)
+        verify(dialog).dismiss()

        verify(activityStarter)
            .postStartActivityDismissingKeyguard(