From 897a2a24198e9c168cb1c289d2bdbae0544f3e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Brzezi=C5=84ski?= Date: Tue, 1 Nov 2022 14:00:20 +0000 Subject: [PATCH] Revert "Make sure userSwitchComplete is dispatched after screen is unfrozen." This reverts commit 7fb0d1dcb013899a7a30799e2df6c6b6cebf317e. Reason for revert: broken test com.android.server.am.UserControllerTest#testContinueUserSwitchUIDisabled Change-Id: I13a3858029c11fbbf8289e602f9eacceaf5ae575 --- .../com/android/server/am/UserController.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 0cb34fa3424e1..82fb1e816888b 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -2116,6 +2116,8 @@ class UserController implements Handler.Callback { mHandler.sendMessage(mHandler.obtainMessage(COMPLETE_USER_SWITCH_MSG, newUserId, 0)); uss.switching = false; + mHandler.removeMessages(REPORT_USER_SWITCH_COMPLETE_MSG); + mHandler.sendMessage(mHandler.obtainMessage(REPORT_USER_SWITCH_COMPLETE_MSG, newUserId, 0)); stopGuestOrEphemeralUserIfBackground(oldUserId); stopUserOnSwitchIfEnforced(oldUserId); @@ -2124,20 +2126,20 @@ class UserController implements Handler.Callback { @VisibleForTesting void completeUserSwitch(int newUserId) { - final Runnable runnable = () -> { - unfreezeScreen(); - mHandler.removeMessages(REPORT_USER_SWITCH_COMPLETE_MSG); - mHandler.sendMessage(mHandler.obtainMessage( - REPORT_USER_SWITCH_COMPLETE_MSG, newUserId, 0)); - }; - if (isUserSwitchUiEnabled()) { // If there is no challenge set, dismiss the keyguard right away if (!mInjector.getKeyguardManager().isDeviceSecure(newUserId)) { // Wait until the keyguard is dismissed to unfreeze - mInjector.dismissKeyguard(runnable, "User Switch"); + mInjector.dismissKeyguard( + new Runnable() { + public void run() { + unfreezeScreen(); + } + }, + "User Switch"); + return; } else { - runnable.run(); + unfreezeScreen(); } } }