diff options
| author | Adam Powell <adamp@google.com> | 2012-06-03 14:11:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-03 14:11:43 -0700 |
| commit | 7c86958d73e7216a92bdfd84fce4440e1def7eaa (patch) | |
| tree | 931a308f3288f1885537641b6a2221e49c6b1af6 /core/res/AndroidManifest.xml | |
| parent | 778fa81f5da05dcc45260caa70c97971bdccf8bb (diff) | |
| parent | 9a1de308cea2d160778fd977825f10a07b49d738 (diff) | |
| download | frameworks_base-7c86958d73e7216a92bdfd84fce4440e1def7eaa.zip frameworks_base-7c86958d73e7216a92bdfd84fce4440e1def7eaa.tar.gz frameworks_base-7c86958d73e7216a92bdfd84fce4440e1def7eaa.tar.bz2 | |
Merge "Add MediaRouter API." into jb-dev
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 9b417a2..d9d87c1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -636,6 +636,12 @@ 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 --> <!-- =========================================== --> |