summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-06-08 14:46:35 -0700
committerAdam Powell <adamp@google.com>2012-06-11 13:17:44 -0700
commitd0d2cda9d414da73773285d7fee9e13aef3495e9 (patch)
tree786eda6b9bdde07b7d8ca5c005c05e846f3e6793 /core/res
parent47adf865bddf6c81051d457e04785408d2710f60 (diff)
downloadframeworks_base-d0d2cda9d414da73773285d7fee9e13aef3495e9.zip
frameworks_base-d0d2cda9d414da73773285d7fee9e13aef3495e9.tar.gz
frameworks_base-d0d2cda9d414da73773285d7fee9e13aef3495e9.tar.bz2
Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions to existing audio and media APIs for now. Tweak/refine other aspects of the API. Pass the router to callbacks for easier future-proofing. Add group/ungroup callback methods. Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9698018..6546fed 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -636,12 +636,6 @@
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signature" />
- <!-- Allows an application to route media output to other devices. -->
- <permission android:name="android.permission.ROUTE_MEDIA_OUTPUT"
- android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
- android:label="@string/permlab_route_media_output"
- android:description="@string/permdesc_route_media_output" />
-
<!-- =========================================== -->
<!-- Permissions associated with telephony state -->
<!-- =========================================== -->