Merge "Implement shell commands for package and user services" (671b8721) · Commits · e / os / android_frameworks_base

cmds/pm/src/com/android/commands/pm/Pm.java

+29 −552

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.SELinux;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		@@ -15085,6 +15086,13 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}

		@Override
		public void onShellCommand(FileDescriptor in, FileDescriptor out,
		FileDescriptor err, String[] args, ResultReceiver resultReceiver) {
		(new PackageManagerShellCommand(this)).exec(
		this, in, out, err, args, resultReceiver);
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

0 → 100644

+529 −0

File added.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/UserManagerService.java

+60 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityManagerNative;
		import android.app.IActivityManager;
		import android.app.IStopUserCallback;
		import android.app.admin.DevicePolicyManager;
		import android.app.admin.DevicePolicyManagerInternal;
		@@ -44,7 +45,9 @@ import android.os.ParcelFileDescriptor;
		import android.os.Parcelable;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.ShellCommand;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.os.UserManager;
		@@ -2164,6 +2167,45 @@ public class UserManagerService extends IUserManager.Stub {
		}
		}

		@Override
		public void onShellCommand(FileDescriptor in, FileDescriptor out,
		FileDescriptor err, String[] args, ResultReceiver resultReceiver) {
		(new Shell()).exec(this, in, out, err, args, resultReceiver);
		}

		int onShellCommand(Shell shell, String cmd) {
		if (cmd == null) {
		return shell.handleDefaultCommands(cmd);
		}

		final PrintWriter pw = shell.getOutPrintWriter();
		try {
		switch(cmd) {
		case "list":
		return runList(pw);
		}
		} catch (RemoteException e) {
		pw.println("Remote exception: " + e);
		}
		return -1;
		}

		private int runList(PrintWriter pw) throws RemoteException {
		final IActivityManager am = ActivityManagerNative.getDefault();
		final List<UserInfo> users = getUsers(false);
		if (users == null) {
		pw.println("Error: couldn't get users");
		return 1;
		} else {
		pw.println("Users:");
		for (int i = 0; i < users.size(); i++) {
		String running = am.isUserRunning(users.get(i).id, false) ? " running" : "";
		pw.println("\t" + users.get(i).toString() + running);
		}
		return 0;
		}
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
		@@ -2288,4 +2330,22 @@ public class UserManagerService extends IUserManager.Stub {
		}
		}
		}

		private class Shell extends ShellCommand {
		@Override
		public int onCommand(String cmd) {
		return onShellCommand(this, cmd);
		}

		@Override
		public void onHelp() {
		final PrintWriter pw = getOutPrintWriter();
		pw.println("User manager (user) commands:");
		pw.println(" help");
		pw.println(" Print this help text.");
		pw.println("");
		pw.println(" list");
		pw.println(" Prints all users on the system.");
		}
		}
		}