diff options
| author | Jaesung Chung <jaesung@google.com> | 2015-05-14 02:14:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 02:14:37 +0000 |
| commit | f5edb20ae90ab9a817c8cf23b5a0d21fe8c80e2a (patch) | |
| tree | 48033946aa88d7ae5217938342f352d7ca48bfa2 /core/res | |
| parent | e9ea718f30915a5fdb37030bc4073038a95491ae (diff) | |
| parent | 58739e758428f3b880f8e67161f57c59aa06d496 (diff) | |
| download | frameworks_base-f5edb20ae90ab9a817c8cf23b5a0d21fe8c80e2a.zip frameworks_base-f5edb20ae90ab9a817c8cf23b5a0d21fe8c80e2a.tar.gz frameworks_base-f5edb20ae90ab9a817c8cf23b5a0d21fe8c80e2a.tar.bz2 | |
Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 34a9265..4c034b3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1107,6 +1107,11 @@ <permission android:name="android.permission.CAPTURE_TV_INPUT" android:protectionLevel="signatureOrSystem" /> + <!-- @hide Allows TvInputService to access DVB device. + <p>Not for use by third-party applications. --> + <permission android:name="android.permission.DVB_DEVICE" + android:protectionLevel="signatureOrSystem" /> + <!-- @hide Allows enabling/disabling OEM unlock <p>Not for use by third-party applications. --> <permission android:name="android.permission.OEM_UNLOCK_STATE" |