Merge "Add a shell command option to allow sending broadcast asynchronously" into sc-dev (f11eee95) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
	private int mTaskId;		private int mTaskId;
	private boolean mIsTaskOverlay;		private boolean mIsTaskOverlay;
	private boolean mIsLockTask;		private boolean mIsLockTask;
			private boolean mAsync;
	private BroadcastOptions mBroadcastOptions;		private BroadcastOptions mBroadcastOptions;

	final boolean mDumping;		final boolean mDumping;
	@@ -342,6 +343,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
	mTaskId = INVALID_TASK_ID;		mTaskId = INVALID_TASK_ID;
	mIsTaskOverlay = false;		mIsTaskOverlay = false;
	mIsLockTask = false;		mIsLockTask = false;
			mAsync = false;
	mBroadcastOptions = null;		mBroadcastOptions = null;

	return Intent.parseCommandArgs(this, new Intent.CommandOptionHandler() {		return Intent.parseCommandArgs(this, new Intent.CommandOptionHandler() {
	@@ -406,6 +408,8 @@ final class ActivityManagerShellCommand extends ShellCommand {
	mBroadcastOptions = BroadcastOptions.makeBasic();		mBroadcastOptions = BroadcastOptions.makeBasic();
	}		}
	mBroadcastOptions.setBackgroundActivityStartsAllowed(true);		mBroadcastOptions.setBackgroundActivityStartsAllowed(true);
			} else if (opt.equals("--async")) {
			mAsync = true;
	} else {		} else {
	return false;		return false;
	}		}
	@@ -756,7 +760,9 @@ final class ActivityManagerShellCommand extends ShellCommand {
	mInterface.broadcastIntentWithFeature(null, null, intent, null, receiver, 0, null, null,		mInterface.broadcastIntentWithFeature(null, null, intent, null, receiver, 0, null, null,
	requiredPermissions, android.app.AppOpsManager.OP_NONE, bundle, true, false,		requiredPermissions, android.app.AppOpsManager.OP_NONE, bundle, true, false,
	mUserId);		mUserId);
			if (!mAsync) {
	receiver.waitForFinish();		receiver.waitForFinish();
			}
	return 0;		return 0;
	}		}

	@@ -3180,13 +3186,17 @@ final class ActivityManagerShellCommand extends ShellCommand {
	pw.println(" Stop a Service. Options are:");		pw.println(" Stop a Service. Options are:");
	pw.println(" --user <USER_ID> \| current: Specify which user to run as; if not");		pw.println(" --user <USER_ID> \| current: Specify which user to run as; if not");
	pw.println(" specified then run as the current user.");		pw.println(" specified then run as the current user.");
	pw.println(" broadcast [--user <USER_ID> \| all \| current] <INTENT>");		pw.println(" broadcast [--user <USER_ID> \| all \| current]");
			pw.println(" [--receiver-permission <PERMISSION>]");
			pw.println(" [--allow-background-activity-starts]");
			pw.println(" [--async] <INTENT>");
	pw.println(" Send a broadcast Intent. Options are:");		pw.println(" Send a broadcast Intent. Options are:");
	pw.println(" --user <USER_ID> \| all \| current: Specify which user to send to; if not");		pw.println(" --user <USER_ID> \| all \| current: Specify which user to send to; if not");
	pw.println(" specified then send to all users.");		pw.println(" specified then send to all users.");
	pw.println(" --receiver-permission <PERMISSION>: Require receiver to hold permission.");		pw.println(" --receiver-permission <PERMISSION>: Require receiver to hold permission.");
	pw.println(" --allow-background-activity-starts: The receiver may start activities");		pw.println(" --allow-background-activity-starts: The receiver may start activities");
	pw.println(" even if in the background.");		pw.println(" even if in the background.");
			pw.println(" --async: Send without waiting for the completion of the receiver.");
	pw.println(" instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]");		pw.println(" instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]");
	pw.println(" [--user <USER_ID> \| current]");		pw.println(" [--user <USER_ID> \| current]");
	pw.println(" [--no-hidden-api-checks [--no-test-api-access]]");		pw.println(" [--no-hidden-api-checks [--no-test-api-access]]");