Do now allow current user to be removed
It was possible to remove a foreground user using pm remove-user command.
The system ends up in the inconsistent state, because switch does not happen
and the removed user stays in the foreground, but its state is removed.
Also added am get-current-user command.
Change-Id: Ida2dce8f99bac55e106cdd44c93e96cc9142d7fb
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 6386a91..87a8540 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1518,6 +1518,11 @@
long ident = Binder.clearCallingIdentity();
try {
final UserInfo user;
+ int currentUser = ActivityManager.getCurrentUser();
+ if (currentUser == userHandle) {
+ Log.w(LOG_TAG, "Current user cannot be removed");
+ return false;
+ }
synchronized (mPackagesLock) {
user = mUsers.get(userHandle);
if (userHandle == 0 || user == null || mRemovingUserIds.get(userHandle)) {