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/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 5c9fd51..4a13136 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -44,6 +44,7 @@
import android.content.pm.IPackageManager;
import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.net.Uri;
@@ -63,6 +64,7 @@
import android.view.IWindowManager;
import com.android.internal.os.BaseCommand;
+import com.android.internal.util.Preconditions;
import java.io.BufferedReader;
import java.io.File;
@@ -168,6 +170,7 @@
" am get-inactive [--user <USER_ID>] <PACKAGE>\n" +
" am send-trim-memory [--user <USER_ID>] <PROCESS>\n" +
" [HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|RUNNING_CRITICAL|COMPLETE]\n" +
+ " am get-current-user\n" +
"\n" +
"am start: start an Activity. Options are:\n" +
" -D: enable debugging\n" +
@@ -334,7 +337,9 @@
"\n" +
"am get-inactive: returns the inactive state of an app.\n" +
"\n" +
- "am send-trim-memory: Send a memory trim event to a <PROCESS>.\n" +
+ "am send-trim-memory: send a memory trim event to a <PROCESS>.\n" +
+ "\n" +
+ "am get-current-user: returns id of the current foreground user.\n" +
"\n" +
"<INTENT> specifications include these flags and arguments:\n" +
" [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
@@ -464,6 +469,8 @@
runGetInactive();
} else if (op.equals("send-trim-memory")) {
runSendTrimMemory();
+ } else if (op.equals("get-current-user")) {
+ runGetCurrentUser();
} else {
showError("Error: unknown command '" + op + "'");
}
@@ -2712,6 +2719,12 @@
}
}
+ private void runGetCurrentUser() throws Exception {
+ UserInfo currentUser = Preconditions.checkNotNull(mAm.getCurrentUser(),
+ "Current user not set");
+ System.out.println(currentUser.id);
+ }
+
/**
* Open the given file for sending into the system process. This verifies
* with SELinux that the system will have access to the file.
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)) {