From ab0cf8c78dc0c5a036cbe5f2a130fd2f255be193 Mon Sep 17 00:00:00 2001
From: Peter Kalauskas <peskal@google.com>
Date: Wed, 30 Jun 2021 15:55:12 -0700
Subject: [PATCH] Remove guest after "Reset guest" is used in QS

Fix issue where guests were marked for deletion but never removed.

Test: Switch to guest, run adb shell cmd user list -v --all, reset guest
      via QS, list users again and confirm that there is only one guest
Bug: 192012960
Change-Id: Ia74f302134406e6ba1f513170f4c0319b6338706
---
 .../systemui/statusbar/policy/UserSwitcherController.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index 14190d86cea5d..e2b6895e7039a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -671,6 +671,7 @@ public class UserSwitcherController implements Dumpable {
                     scheduleGuestCreation();
                 }
                 switchToUserId(targetUserId);
+                mUserManager.removeUser(currentUser.id);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "Couldn't remove guest because ActivityManager or WindowManager is dead");