summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kalauskas <peskal@google.com>2021-07-01 18:18:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-01 18:18:34 +0000
commit52f8647119ba2a342c50d9cf61a9cfd44a7792e4 (patch)
tree5f64043965a63fe6cc7a0464697605bcaf4d3e05
parent9e35e8a3547d1b809991ffb93d03195449d6bf0f (diff)
parenta379ce3bd28f172a228b29f08a42bd8137cf9f7c (diff)
Merge "Remove guest after "Reset guest" is used in QS" into sc-dev am: a379ce3bd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15163953 Change-Id: I6c585a021eb1d4ea6c192426f669e2cac694b853
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java1
1 files changed, 1 insertions, 0 deletions
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 14190d86cea5..e2b6895e7039 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");