diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt | 4 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/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 75bf18953bf1..260a3714a368 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 aad03e25de60..9d908fdfb976 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( |