diff options
author | Jeff Brown <jeffbrown@google.com> | 2013-11-08 01:36:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-08 01:36:41 +0000 |
commit | 1f7a8a06256907e03405f89108f081289c23e97a (patch) | |
tree | 8ef01bc8a8f7b2b7edfa3cb1633dc2c0f2f5b882 /core/res/AndroidManifest.xml | |
parent | 1e45fd78090693c5eff346feb32bab90f31a5e30 (diff) | |
parent | f3c99e883f46c56e5e2877e844b902b6eb45545b (diff) | |
download | frameworks_base-1f7a8a06256907e03405f89108f081289c23e97a.zip frameworks_base-1f7a8a06256907e03405f89108f081289c23e97a.tar.gz frameworks_base-1f7a8a06256907e03405f89108f081289c23e97a.tar.bz2 |
Merge "Add a platform library for remote display providers." into klp-dev
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r-- | core/res/AndroidManifest.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6ddd3fe..2c5c6b5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1992,6 +1992,14 @@ android:description="@string/permdesc_bindWallpaper" android:protectionLevel="signature|system" /> + <!-- Must be required by a {@link com.android.media.remotedisplay.RemoteDisplayProvider}, + to ensure that only the system can bind to it. + @hide --> + <permission android:name="android.permission.BIND_REMOTE_DISPLAY" + android:label="@string/permlab_bindRemoteDisplay" + android:description="@string/permdesc_bindRemoteDisplay" + android:protectionLevel="signature" /> + <!-- Must be required by device administration receiver, to ensure that only the system can interact with it. --> <permission android:name="android.permission.BIND_DEVICE_ADMIN" |