Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101101

Change-Id: I72f8fab4f5aaa54460126c94ff6f58be668d90fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charles Chiu
2022-06-29 07:30:07 +00:00
committed by Automerger Merge Worker
parent 966d447477 bfc1787139
commit f2848ae1cf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt
View File

@@ -95,7 +95,9 @@ class UserSwitchDialogController @VisibleForTesting constructor(
getButton(BUTTON_NEUTRAL)
)
dismiss()
if (controller == null) {
dismiss()
}
activityStarter.postStartActivityDismissingKeyguard(
USER_SETTINGS_INTENT, 0, controller

1
packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt
View File

@@ -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(