summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2014-05-26 02:26:04 +0000
committerWonsik Kim <wonsik@google.com>2014-05-27 01:33:50 +0000
commitc22dbb69194c8e8fe2a32326d1f37a738cad0904 (patch)
treee677e7246c3c580b904d386624e10555aac9459c /core/res
parent41b170d6066cb52bb3e396c608b01f2981b95e5d (diff)
downloadframeworks_base-c22dbb69194c8e8fe2a32326d1f37a738cad0904.zip
frameworks_base-c22dbb69194c8e8fe2a32326d1f37a738cad0904.tar.gz
frameworks_base-c22dbb69194c8e8fe2a32326d1f37a738cad0904.tar.bz2
Revert "Revert "Add physical TV input handling to TvInputManagerService""
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215. Bug: 14118245, Bug: 15197740 Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1874fd8..14141d7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1014,6 +1014,13 @@
android:description="@string/permdesc_sim_communication"
android:protectionLevel="dangerous" />
+ <!-- Allows TvInputService to access underlying TV input hardware such as
+ built-in tuners and HDMI-in's.
+ @hide This should only be used by OEM's TvInputService's.
+ -->
+ <permission android:name="android.permission.TV_INPUT_HARDWARE"
+ android:protectionLevel="signatureOrSystem" />
+
<!-- =========================================== -->
<!-- Permissions associated with audio capture -->
<!-- =========================================== -->