Revert "Make media command be a shell command" (feb6023c) · Commits · e / os / android_frameworks_base

cmds/media/Android.bp

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			// Copyright 2013 The Android Open Source Project
			//

			java_binary {
			name: "media",
			wrapper: "media",
			srcs: ["*/.java"],
			}

cmds/media/MODULE_LICENSE_APACHE2

0 → 100644

+0 −0

Empty file added.

cmds/media/NOTICE

0 → 100644

+190 −0

Original line number	Original line	Diff line number	Diff line

			Copyright (c) 2005-2008, The Android Open Source Project

			Licensed under the Apache License, Version 2.0 (the "License");
			you may not use this file except in compliance with the License.

			Unless required by applicable law or agreed to in writing, software
			distributed under the License is distributed on an "AS IS" BASIS,
			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			See the License for the specific language governing permissions and
			limitations under the License.


			Apache License
			Version 2.0, January 2004
			http://www.apache.org/licenses/

			TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

			1. Definitions.

			"License" shall mean the terms and conditions for use, reproduction,
			and distribution as defined by Sections 1 through 9 of this document.

			"Licensor" shall mean the copyright owner or entity authorized by
			the copyright owner that is granting the License.

			"Legal Entity" shall mean the union of the acting entity and all
			other entities that control, are controlled by, or are under common
			control with that entity. For the purposes of this definition,
			"control" means (i) the power, direct or indirect, to cause the
			direction or management of such entity, whether by contract or
			otherwise, or (ii) ownership of fifty percent (50%) or more of the
			outstanding shares, or (iii) beneficial ownership of such entity.

			"You" (or "Your") shall mean an individual or Legal Entity
			exercising permissions granted by this License.

			"Source" form shall mean the preferred form for making modifications,
			including but not limited to software source code, documentation
			source, and configuration files.

			"Object" form shall mean any form resulting from mechanical
			transformation or translation of a Source form, including but
			not limited to compiled object code, generated documentation,
			and conversions to other media types.

			"Work" shall mean the work of authorship, whether in Source or
			Object form, made available under the License, as indicated by a
			copyright notice that is included in or attached to the work
			(an example is provided in the Appendix below).

			"Derivative Works" shall mean any work, whether in Source or Object
			form, that is based on (or derived from) the Work and for which the
			editorial revisions, annotations, elaborations, or other modifications
			represent, as a whole, an original work of authorship. For the purposes
			of this License, Derivative Works shall not include works that remain
			separable from, or merely link (or bind by name) to the interfaces of,
			the Work and Derivative Works thereof.

			"Contribution" shall mean any work of authorship, including
			the original version of the Work and any modifications or additions
			to that Work or Derivative Works thereof, that is intentionally
			submitted to Licensor for inclusion in the Work by the copyright owner
			or by an individual or Legal Entity authorized to submit on behalf of
			the copyright owner. For the purposes of this definition, "submitted"
			means any form of electronic, verbal, or written communication sent
			to the Licensor or its representatives, including but not limited to
			communication on electronic mailing lists, source code control systems,
			and issue tracking systems that are managed by, or on behalf of, the
			Licensor for the purpose of discussing and improving the Work, but
			excluding communication that is conspicuously marked or otherwise
			designated in writing by the copyright owner as "Not a Contribution."

			"Contributor" shall mean Licensor and any individual or Legal Entity
			on behalf of whom a Contribution has been received by Licensor and
			subsequently incorporated within the Work.

			2. Grant of Copyright License. Subject to the terms and conditions of
			this License, each Contributor hereby grants to You a perpetual,
			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
			copyright license to reproduce, prepare Derivative Works of,
			publicly display, publicly perform, sublicense, and distribute the
			Work and such Derivative Works in Source or Object form.

			3. Grant of Patent License. Subject to the terms and conditions of
			this License, each Contributor hereby grants to You a perpetual,
			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
			(except as stated in this section) patent license to make, have made,
			use, offer to sell, sell, import, and otherwise transfer the Work,
			where such license applies only to those patent claims licensable
			by such Contributor that are necessarily infringed by their
			Contribution(s) alone or by combination of their Contribution(s)
			with the Work to which such Contribution(s) was submitted. If You
			institute patent litigation against any entity (including a
			cross-claim or counterclaim in a lawsuit) alleging that the Work
			or a Contribution incorporated within the Work constitutes direct
			or contributory patent infringement, then any patent licenses
			granted to You under this License for that Work shall terminate
			as of the date such litigation is filed.

			4. Redistribution. You may reproduce and distribute copies of the
			Work or Derivative Works thereof in any medium, with or without
			modifications, and in Source or Object form, provided that You
			meet the following conditions:

			(a) You must give any other recipients of the Work or
			Derivative Works a copy of this License; and

			(b) You must cause any modified files to carry prominent notices
			stating that You changed the files; and

			(c) You must retain, in the Source form of any Derivative Works
			that You distribute, all copyright, patent, trademark, and
			attribution notices from the Source form of the Work,
			excluding those notices that do not pertain to any part of
			the Derivative Works; and

			(d) If the Work includes a "NOTICE" text file as part of its
			distribution, then any Derivative Works that You distribute must
			include a readable copy of the attribution notices contained
			within such NOTICE file, excluding those notices that do not
			pertain to any part of the Derivative Works, in at least one
			of the following places: within a NOTICE text file distributed
			as part of the Derivative Works; within the Source form or
			documentation, if provided along with the Derivative Works; or,
			within a display generated by the Derivative Works, if and
			wherever such third-party notices normally appear. The contents
			of the NOTICE file are for informational purposes only and
			do not modify the License. You may add Your own attribution
			notices within Derivative Works that You distribute, alongside
			or as an addendum to the NOTICE text from the Work, provided
			that such additional attribution notices cannot be construed
			as modifying the License.

			You may add Your own copyright statement to Your modifications and
			may provide additional or different license terms and conditions
			for use, reproduction, or distribution of Your modifications, or
			for any such Derivative Works as a whole, provided Your use,
			reproduction, and distribution of the Work otherwise complies with
			the conditions stated in this License.

			5. Submission of Contributions. Unless You explicitly state otherwise,
			any Contribution intentionally submitted for inclusion in the Work
			by You to the Licensor shall be under the terms and conditions of
			this License, without any additional terms or conditions.
			Notwithstanding the above, nothing herein shall supersede or modify
			the terms of any separate license agreement you may have executed
			with Licensor regarding such Contributions.

			6. Trademarks. This License does not grant permission to use the trade
			names, trademarks, service marks, or product names of the Licensor,
			except as required for reasonable and customary use in describing the
			origin of the Work and reproducing the content of the NOTICE file.

			7. Disclaimer of Warranty. Unless required by applicable law or
			agreed to in writing, Licensor provides the Work (and each
			Contributor provides its Contributions) on an "AS IS" BASIS,
			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
			implied, including, without limitation, any warranties or conditions
			of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
			PARTICULAR PURPOSE. You are solely responsible for determining the
			appropriateness of using or redistributing the Work and assume any
			risks associated with Your exercise of permissions under this License.

			8. Limitation of Liability. In no event and under no legal theory,
			whether in tort (including negligence), contract, or otherwise,
			unless required by applicable law (such as deliberate and grossly
			negligent acts) or agreed to in writing, shall any Contributor be
			liable to You for damages, including any direct, indirect, special,
			incidental, or consequential damages of any character arising as a
			result of this License or out of the use or inability to use the
			Work (including but not limited to damages for loss of goodwill,
			work stoppage, computer failure or malfunction, or any and all
			other commercial damages or losses), even if such Contributor
			has been advised of the possibility of such damages.

			9. Accepting Warranty or Additional Liability. While redistributing
			the Work or Derivative Works thereof, You may choose to offer,
			and charge a fee for, acceptance of support, warranty, indemnity,
			or other liability obligations and/or rights consistent with this
			License. However, in accepting such obligations, You may act only
			on Your own behalf and on Your sole responsibility, not on behalf
			of any other Contributor, and only if You agree to indemnify,
			defend, and hold each Contributor harmless for any liability
			incurred by, or claims asserted against, such Contributor by reason
			of your accepting any such warranty or additional liability.

			END OF TERMS AND CONDITIONS

cmds/media/media

0 → 100755

+3 −0

Original line number	Original line	Diff line number	Diff line
			#!/system/bin/sh
			export CLASSPATH=/system/framework/media.jar
			exec app_process /system/bin com.android.commands.media.Media "$@"

services/core/java/com/android/server/media/MediaShellCommand.java→cmds/media/src/com/android/commands/media/Media.java

+94 −102

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2019 The Android Open Source Project		**
	*		** Copyright 2013, The Android Open Source Project
	* Licensed under the Apache License, Version 2.0 (the "License");		**
	* you may not use this file except in compliance with the License.		** Licensed under the Apache License, Version 2.0 (the "License");
	* You may obtain a copy of the License at		** you may not use this file except in compliance with the License.
	*		** You may obtain a copy of the License at
	* http://www.apache.org/licenses/LICENSE-2.0		**
	*		** http://www.apache.org/licenses/LICENSE-2.0
	* Unless required by applicable law or agreed to in writing, software		**
	* distributed under the License is distributed on an "AS IS" BASIS,		** Unless required by applicable law or agreed to in writing, software
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		** distributed under the License is distributed on an "AS IS" BASIS,
	* See the License for the specific language governing permissions and		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* limitations under the License.		** See the License for the specific language governing permissions and
			** limitations under the License.
	*/		*/

	package com.android.server.media;		package com.android.commands.media;

	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.content.Context;		import android.content.Context;
	import android.media.MediaMetadata;		import android.media.MediaMetadata;
	import android.media.session.ISessionManager;		import android.media.session.ISessionManager;
	import android.media.session.MediaController;		import android.media.session.MediaController;
	import android.media.session.MediaSession;		import android.media.session.MediaController.PlaybackInfo;
			import android.media.session.MediaSession.QueueItem;
	import android.media.session.MediaSessionManager;		import android.media.session.MediaSessionManager;
	import android.media.session.PlaybackState;		import android.media.session.PlaybackState;
	import android.os.Bundle;		import android.os.Bundle;
	@@ -29,41 +31,59 @@ import android.os.HandlerThread;
	import android.os.Looper;		import android.os.Looper;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.os.ShellCommand;
	import android.os.SystemClock;		import android.os.SystemClock;
	import android.text.TextUtils;		import android.util.AndroidException;
	import android.view.InputDevice;		import android.view.InputDevice;
	import android.view.KeyCharacterMap;		import android.view.KeyCharacterMap;
	import android.view.KeyEvent;		import android.view.KeyEvent;

			import com.android.internal.os.BaseCommand;

	import java.io.BufferedReader;		import java.io.BufferedReader;
	import java.io.IOException;		import java.io.IOException;
	import java.io.InputStreamReader;		import java.io.InputStreamReader;
	import java.io.PrintWriter;		import java.io.PrintStream;
	import java.util.List;		import java.util.List;

	/**		public class Media extends BaseCommand {
	* ShellCommand for MediaSessionService.
	*/
	public class MediaShellCommand extends ShellCommand {
	// This doesn't belongs to any package. Setting the package name to empty string.		// This doesn't belongs to any package. Setting the package name to empty string.
	private static final String PACKAGE_NAME = "";		private static final String PACKAGE_NAME = "";
	private static ActivityThread sThread;		private static ActivityThread sThread;
	private static MediaSessionManager sMediaSessionManager;		private static MediaSessionManager sMediaSessionManager;
	private ISessionManager mSessionService;		private ISessionManager mSessionService;
	private PrintWriter mWriter;
	private PrintWriter mErrorWriter;

	@Override		/**
	public int onCommand(String cmd) {		* Command-line entry point.
	mWriter = getOutPrintWriter();		*
	mErrorWriter = getErrPrintWriter();		* @param args The command-line arguments
			*/
			public static void main(String[] args) {
			(new Media()).run(args);
			}

	if (TextUtils.isEmpty(cmd)) {		@Override
	return handleDefaultCommands(cmd);		public void onShowUsage(PrintStream out) {
			out.println(
			"usage: media [subcommand] [options]\n" +
			" media dispatch KEY\n" +
			" media list-sessions\n" +
			" media monitor <tag>\n" +
			" media volume [options]\n" +
			"\n" +
			"media dispatch: dispatch a media key to the system.\n" +
			" KEY may be: play, pause, play-pause, mute, headsethook,\n" +
			" stop, next, previous, rewind, record, fast-forword.\n" +
			"media list-sessions: print a list of the current sessions.\n" +
			"media monitor: monitor updates to the specified session.\n" +
			" Use the tag from list-sessions.\n" +
			"media volume: " + VolumeCtrl.USAGE
			);
	}		}

			@Override
			public void onRun() throws Exception {
	if (sThread == null) {		if (sThread == null) {
	Looper.prepare();		Looper.prepareMainLooper();
	sThread = ActivityThread.systemMain();		sThread = ActivityThread.systemMain();
	Context context = sThread.getSystemContext();		Context context = sThread.getSystemContext();
	sMediaSessionManager =		sMediaSessionManager =
	@@ -72,47 +92,25 @@ public class MediaShellCommand extends ShellCommand {
	mSessionService = ISessionManager.Stub.asInterface(ServiceManager.checkService(		mSessionService = ISessionManager.Stub.asInterface(ServiceManager.checkService(
	Context.MEDIA_SESSION_SERVICE));		Context.MEDIA_SESSION_SERVICE));
	if (mSessionService == null) {		if (mSessionService == null) {
	throw new IllegalStateException(		System.err.println(NO_SYSTEM_ERROR_CODE);
			throw new AndroidException(
	"Can't connect to media session service; is the system running?");		"Can't connect to media session service; is the system running?");
	}		}

	try {		String op = nextArgRequired();
	if (cmd.equals("dispatch")) {
			if (op.equals("dispatch")) {
	runDispatch();		runDispatch();
	} else if (cmd.equals("list-sessions")) {		} else if (op.equals("list-sessions")) {
	runListSessions();		runListSessions();
	} else if (cmd.equals("monitor")) {		} else if (op.equals("monitor")) {
	runMonitor();		runMonitor();
	} else if (cmd.equals("volume")) {		} else if (op.equals("volume")) {
	runVolume();		runVolume();
	} else {		} else {
	showError("Error: unknown command '" + cmd + "'");		showError("Error: unknown command '" + op + "'");
	return -1;		return;
	}
	} catch (Exception e) {
	showError(e.toString());
	return -1;
	}
	return 0;
	}		}

	@Override
	public void onHelp() {
	mWriter.println("usage: media_session [subcommand] [options]");
	mWriter.println(" media_session dispatch KEY");
	mWriter.println(" media_session dispatch KEY");
	mWriter.println(" media_session list-sessions");
	mWriter.println(" media_session monitor <tag>");
	mWriter.println(" media_session volume [options]");
	mWriter.println();
	mWriter.println("media_session dispatch: dispatch a media key to the system.");
	mWriter.println(" KEY may be: play, pause, play-pause, mute, headsethook,");
	mWriter.println(" stop, next, previous, rewind, record, fast-forword.");
	mWriter.println("media_session list-sessions: print a list of the current sessions.");
	mWriter.println("media_session monitor: monitor updates to the specified session.");
	mWriter.println(" Use the tag from list-sessions.");
	mWriter.println("media_session volume: " + VolumeCtrl.USAGE);
	mWriter.println();
	}		}

	private void sendMediaKey(KeyEvent event) {		private void sendMediaKey(KeyEvent event) {
	@@ -123,7 +121,7 @@ public class MediaShellCommand extends ShellCommand {
	}		}

	private void runMonitor() throws Exception {		private void runMonitor() throws Exception {
	String id = getNextArgRequired();		String id = nextArgRequired();
	if (id == null) {		if (id == null) {
	showError("Error: must include a session id");		showError("Error: must include a session id");
	return;		return;
	@@ -135,8 +133,7 @@ public class MediaShellCommand extends ShellCommand {
	for (MediaController controller : controllers) {		for (MediaController controller : controllers) {
	try {		try {
	if (controller != null && id.equals(controller.getTag())) {		if (controller != null && id.equals(controller.getTag())) {
	MediaShellCommand.ControllerMonitor monitor =		ControllerMonitor monitor = new ControllerMonitor(controller);
	new MediaShellCommand.ControllerMonitor(controller);
	monitor.run();		monitor.run();
	success = true;		success = true;
	break;		break;
	@@ -146,15 +143,15 @@ public class MediaShellCommand extends ShellCommand {
	}		}
	}		}
	} catch (Exception e) {		} catch (Exception e) {
	mErrorWriter.println("*Error monitoring session* " + e.getMessage());		System.out.println("*Error monitoring session* " + e.getMessage());
	}		}
	if (!success) {		if (!success) {
	mErrorWriter.println("No session found with id " + id);		System.out.println("No session found with id " + id);
	}		}
	}		}

	private void runDispatch() throws Exception {		private void runDispatch() throws Exception {
	String cmd = getNextArgRequired();		String cmd = nextArgRequired();
	int keycode;		int keycode;
	if ("play".equals(cmd)) {		if ("play".equals(cmd)) {
	keycode = KeyEvent.KEYCODE_MEDIA_PLAY;		keycode = KeyEvent.KEYCODE_MEDIA_PLAY;
	@@ -189,73 +186,68 @@ public class MediaShellCommand extends ShellCommand {
	KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD));		KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD));
	}		}

	void showError(String errMsg) {
	onHelp();
	mErrorWriter.println(errMsg);
	}

	class ControllerCallback extends MediaController.Callback {		class ControllerCallback extends MediaController.Callback {
	@Override		@Override
	public void onSessionDestroyed() {		public void onSessionDestroyed() {
	mWriter.println("onSessionDestroyed. Enter q to quit.");		System.out.println("onSessionDestroyed. Enter q to quit.");
	}		}

	@Override		@Override
	public void onSessionEvent(String event, Bundle extras) {		public void onSessionEvent(String event, Bundle extras) {
	mWriter.println("onSessionEvent event=" + event + ", extras=" + extras);		System.out.println("onSessionEvent event=" + event + ", extras=" + extras);
	}		}

	@Override		@Override
	public void onPlaybackStateChanged(PlaybackState state) {		public void onPlaybackStateChanged(PlaybackState state) {
	mWriter.println("onPlaybackStateChanged " + state);		System.out.println("onPlaybackStateChanged " + state);
	}		}

	@Override		@Override
	public void onMetadataChanged(MediaMetadata metadata) {		public void onMetadataChanged(MediaMetadata metadata) {
	String mmString = metadata == null ? null : "title=" + metadata		String mmString = metadata == null ? null : "title=" + metadata
	.getDescription();		.getDescription();
	mWriter.println("onMetadataChanged " + mmString);		System.out.println("onMetadataChanged " + mmString);
	}		}

	@Override		@Override
	public void onQueueChanged(List<MediaSession.QueueItem> queue) {		public void onQueueChanged(List<QueueItem> queue) {
	mWriter.println("onQueueChanged, "		System.out.println("onQueueChanged, "
	+ (queue == null ? "null queue" : " size=" + queue.size()));		+ (queue == null ? "null queue" : " size=" + queue.size()));
	}		}

	@Override		@Override
	public void onQueueTitleChanged(CharSequence title) {		public void onQueueTitleChanged(CharSequence title) {
	mWriter.println("onQueueTitleChange " + title);		System.out.println("onQueueTitleChange " + title);
	}		}

	@Override		@Override
	public void onExtrasChanged(Bundle extras) {		public void onExtrasChanged(Bundle extras) {
	mWriter.println("onExtrasChanged " + extras);		System.out.println("onExtrasChanged " + extras);
	}		}

	@Override		@Override
	public void onAudioInfoChanged(MediaController.PlaybackInfo info) {		public void onAudioInfoChanged(PlaybackInfo info) {
	mWriter.println("onAudioInfoChanged " + info);		System.out.println("onAudioInfoChanged " + info);
	}		}
	}		}

	private class ControllerMonitor {		private class ControllerMonitor {
	private final MediaController mController;		private final MediaController mController;
	private final MediaShellCommand.ControllerCallback mControllerCallback;		private final ControllerCallback mControllerCallback;

	ControllerMonitor(MediaController controller) {		ControllerMonitor(MediaController controller) {
	mController = controller;		mController = controller;
	mControllerCallback = new MediaShellCommand.ControllerCallback();		mControllerCallback = new ControllerCallback();
	}		}

	void printUsageMessage() {		void printUsageMessage() {
	try {		try {
	mWriter.println("V2Monitoring session " + mController.getTag()		System.out.println("V2Monitoring session " + mController.getTag()
	+ "... available commands: play, pause, next, previous");		+ "... available commands: play, pause, next, previous");
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	mWriter.println("Error trying to monitor session!");		System.out.println("Error trying to monitor session!");
	}		}
	mWriter.println("(q)uit: finish monitoring");		System.out.println("(q)uit: finish monitoring");
	}		}

	void run() throws RemoteException {		void run() throws RemoteException {
	@@ -266,7 +258,7 @@ public class MediaShellCommand extends ShellCommand {
	try {		try {
	mController.registerCallback(mControllerCallback);		mController.registerCallback(mControllerCallback);
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	mErrorWriter.println("Error registering monitor callback");		System.out.println("Error registering monitor callback");
	}		}
	}		}
	};		};
	@@ -292,7 +284,7 @@ public class MediaShellCommand extends ShellCommand {
	} else if ("previous".equals(line)) {		} else if ("previous".equals(line)) {
	dispatchKeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS);		dispatchKeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
	} else {		} else {
	mErrorWriter.println("Invalid command: " + line);		System.out.println("Invalid command: " + line);
	}		}

	synchronized (this) {		synchronized (this) {
	@@ -324,19 +316,19 @@ public class MediaShellCommand extends ShellCommand {
	mController.dispatchMediaButtonEvent(down);		mController.dispatchMediaButtonEvent(down);
	mController.dispatchMediaButtonEvent(up);		mController.dispatchMediaButtonEvent(up);
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	mErrorWriter.println("Failed to dispatch " + keyCode);		System.out.println("Failed to dispatch " + keyCode);
	}		}
	}		}
	}		}

	private void runListSessions() {		private void runListSessions() {
	mWriter.println("Sessions:");		System.out.println("Sessions:");
	try {		try {
	List<MediaController> controllers = sMediaSessionManager.getActiveSessions(null);		List<MediaController> controllers = sMediaSessionManager.getActiveSessions(null);
	for (MediaController controller : controllers) {		for (MediaController controller : controllers) {
	if (controller != null) {		if (controller != null) {
	try {		try {
	mWriter.println(" tag=" + controller.getTag()		System.out.println(" tag=" + controller.getTag()
	+ ", package=" + controller.getPackageName());		+ ", package=" + controller.getPackageName());
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	// ignore		// ignore
	@@ -344,7 +336,7 @@ public class MediaShellCommand extends ShellCommand {
	}		}
	}		}
	} catch (Exception e) {		} catch (Exception e) {
	mErrorWriter.println("*Error listing sessions*");		System.out.println("*Error listing sessions*");
	}		}
	}		}