diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-04-04 18:50:23 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2013-04-08 13:08:37 -0700 |
commit | 79f7ec70ebd5758ce54fd5b6fcd60fd27457cba6 (patch) | |
tree | 6bc7542adfb792659a153a5000fb94a3ed6abb6a /cmds/media | |
parent | bab9687e6473072d6ff4f7ea5a7b21bcfbf95744 (diff) | |
download | frameworks_base-79f7ec70ebd5758ce54fd5b6fcd60fd27457cba6.zip frameworks_base-79f7ec70ebd5758ce54fd5b6fcd60fd27457cba6.tar.gz frameworks_base-79f7ec70ebd5758ce54fd5b6fcd60fd27457cba6.tar.bz2 |
Have audio service clean up new receivers in crashing processes.
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away. These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.
Also added some additional cleanup of media button receivers
when packages change (updated, cleared).
And on top of that, a new "media" command for doing media
things. Currently lets you send media keys and monitor
remote display data.
Oh and finally added a new BaseCommand base class for
implementing these command line utilities.
Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
Diffstat (limited to 'cmds/media')
-rw-r--r-- | cmds/media/Android.mk | 15 | ||||
-rw-r--r-- | cmds/media/MODULE_LICENSE_APACHE2 | 0 | ||||
-rw-r--r-- | cmds/media/NOTICE | 190 | ||||
-rwxr-xr-x | cmds/media/media | 6 | ||||
-rw-r--r-- | cmds/media/src/com/android/commands/media/Media.java | 220 |
5 files changed, 431 insertions, 0 deletions
diff --git a/cmds/media/Android.mk b/cmds/media/Android.mk new file mode 100644 index 0000000..b9451c5 --- /dev/null +++ b/cmds/media/Android.mk @@ -0,0 +1,15 @@ +# Copyright 2013 The Android Open Source Project +# +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-subdir-java-files) +LOCAL_MODULE := media_cmd +include $(BUILD_JAVA_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := media +LOCAL_SRC_FILES := media +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) diff --git a/cmds/media/MODULE_LICENSE_APACHE2 b/cmds/media/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/cmds/media/MODULE_LICENSE_APACHE2 diff --git a/cmds/media/NOTICE b/cmds/media/NOTICE new file mode 100644 index 0000000..c5b1efa --- /dev/null +++ b/cmds/media/NOTICE @@ -0,0 +1,190 @@ + + 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 + diff --git a/cmds/media/media b/cmds/media/media new file mode 100755 index 0000000..1194442 --- /dev/null +++ b/cmds/media/media @@ -0,0 +1,6 @@ +# Script to start "media_cmd" on the device, which has a very rudimentary +# shell. +# +base=/system +export CLASSPATH=$base/framework/media_cmd.jar +exec app_process $base/bin com.android.commands.media.Media "$@" diff --git a/cmds/media/src/com/android/commands/media/Media.java b/cmds/media/src/com/android/commands/media/Media.java new file mode 100644 index 0000000..56af7d6 --- /dev/null +++ b/cmds/media/src/com/android/commands/media/Media.java @@ -0,0 +1,220 @@ +/* +** +** 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. +** You may obtain a copy of the License at +** +** 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, +** 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. +*/ + +package com.android.commands.media; + +import android.app.PendingIntent; +import android.content.Context; +import android.graphics.Bitmap; +import android.media.IAudioService; +import android.media.IRemoteControlDisplay; +import android.os.Bundle; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.os.SystemClock; +import android.util.AndroidException; +import android.view.InputDevice; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; +import com.android.internal.os.BaseCommand; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintStream; + +public class Media extends BaseCommand { + + private IAudioService mAudioService; + + /** + * Command-line entry point. + * + * @param args The command-line arguments + */ + public static void main(String[] args) { + (new Media()).run(args); + } + + public void onShowUsage(PrintStream out) { + out.println( + "usage: media [subcommand] [options]\n" + + " media dispatch KEY\n" + + " media remote-display\n" + + "\n" + + "media dispatch: dispatch a media key to the current media client.\n" + + " KEY may be: play, pause, play-pause, mute, headsethook,\n" + + " stop, next, previous, rewind, recordm fast-forword.\n" + + "media remote-display: monitor remote display updates.\n" + ); + } + + public void onRun() throws Exception { + mAudioService = IAudioService.Stub.asInterface(ServiceManager.checkService( + Context.AUDIO_SERVICE)); + if (mAudioService == null) { + System.err.println(NO_SYSTEM_ERROR_CODE); + throw new AndroidException("Can't connect to audio service; is the system running?"); + } + + String op = nextArgRequired(); + + if (op.equals("dispatch")) { + runDispatch(); + } else if (op.equals("remote-display")) { + runRemoteDisplay(); + } else { + showError("Error: unknown command '" + op + "'"); + return; + } + } + + private void sendMediaKey(KeyEvent event) { + try { + mAudioService.dispatchMediaKeyEvent(event); + } catch (RemoteException e) { + } + } + + private void runDispatch() throws Exception { + String cmd = nextArgRequired(); + int keycode; + if ("play".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_PLAY; + } else if ("pause".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_PAUSE; + } else if ("play-pause".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE; + } else if ("mute".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MUTE; + } else if ("headsethook".equals(cmd)) { + keycode = KeyEvent.KEYCODE_HEADSETHOOK; + } else if ("stop".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_STOP; + } else if ("next".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_NEXT; + } else if ("previous".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_PREVIOUS; + } else if ("rewind".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_REWIND; + } else if ("record".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_RECORD; + } else if ("fast-forward".equals(cmd)) { + keycode = KeyEvent.KEYCODE_MEDIA_FAST_FORWARD; + } else { + showError("Error: unknown dispatch code '" + cmd + "'"); + return; + } + + final long now = SystemClock.uptimeMillis(); + sendMediaKey(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keycode, 0, 0, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD)); + sendMediaKey(new KeyEvent(now, now, KeyEvent.ACTION_UP, keycode, 0, 0, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD)); + } + + class RemoteDisplayMonitor extends IRemoteControlDisplay.Stub { + RemoteDisplayMonitor() { + } + + + @Override + public void setCurrentClientId(int clientGeneration, PendingIntent clientMediaIntent, + boolean clearing) { + System.out.println("New client: id=" + clientGeneration + + " intent=" + clientMediaIntent + " clearing=" + clearing); + } + + @Override + public void setPlaybackState(int generationId, int state, long stateChangeTimeMs, + long currentPosMs, float speed) { + System.out.println("New state: id=" + generationId + " state=" + state + + " time=" + stateChangeTimeMs + " pos=" + currentPosMs + " speed=" + speed); + } + + @Override + public void setTransportControlInfo(int generationId, int transportControlFlags, + int posCapabilities) { + System.out.println("New control info: id=" + generationId + + " flags=0x" + Integer.toHexString(transportControlFlags) + + " cap=0x" + Integer.toHexString(posCapabilities)); + } + + @Override + public void setMetadata(int generationId, Bundle metadata) { + System.out.println("New metadata: id=" + generationId + + " data=" + metadata); + } + + @Override + public void setArtwork(int generationId, Bitmap artwork) { + System.out.println("New artwork: id=" + generationId + + " art=" + artwork); + } + + @Override + public void setAllMetadata(int generationId, Bundle metadata, Bitmap artwork) { + System.out.println("New metadata+artwork: id=" + generationId + + " data=" + metadata + " art=" + artwork); + } + + void printUsageMessage() { + System.out.println("Monitoring remote control displays... available commands:"); + System.out.println("(q)uit: finish monitoring"); + } + + void run() throws RemoteException { + printUsageMessage(); + + mAudioService.registerRemoteControlDisplay(this, 0, 0); + + try { + InputStreamReader converter = new InputStreamReader(System.in); + BufferedReader in = new BufferedReader(converter); + String line; + + while ((line = in.readLine()) != null) { + boolean addNewline = true; + if (line.length() <= 0) { + addNewline = false; + } else if ("q".equals(line) || "quit".equals(line)) { + break; + } else { + System.out.println("Invalid command: " + line); + } + + synchronized (this) { + if (addNewline) { + System.out.println(""); + } + printUsageMessage(); + } + } + + } catch (IOException e) { + e.printStackTrace(); + } finally { + mAudioService.unregisterRemoteControlDisplay(this); + } + } + } + + private void runRemoteDisplay() throws Exception { + RemoteDisplayMonitor monitor = new RemoteDisplayMonitor(); + monitor.run(); + } +} |