diff options
| author | Alexander Ray <aray@google.com> | 2013-09-11 19:05:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 19:05:38 +0000 |
| commit | 7563d42331ed7df7f026c8921ae990ce2fca9efd (patch) | |
| tree | 04ec8a1746321f55edf783bb4bceb6485879dd63 /core/res | |
| parent | f702286c94f0df9fc147135c19f12ef34e8594c9 (diff) | |
| parent | 51e95df8f24e9ea30775686b9e324b9a671213dc (diff) | |
| download | frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.zip frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.tar.gz frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.tar.bz2 | |
Merge "Add consumer IR framework" into klp-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 83a0c56..bbef318 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -899,6 +899,13 @@ android:label="@string/permlab_wakeLock" android:description="@string/permdesc_wakeLock" /> + <!-- Allows using the device's IR transmitter, if available --> + <permission android:name="android.permission.TRANSMIT_IR" + android:permissionGroup="android.permission-group.AFFECTS_BATTERY" + android:protectionLevel="normal" + android:label="@string/permlab_transmitIr" + android:description="@string/permdesc_transmitIr" /> + <!-- ==================================================== --> <!-- Permissions related to changing audio settings --> <!-- ==================================================== --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 18ac09d..fa6ecc8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1596,6 +1596,14 @@ <string name="permdesc_wakeLock" product="default">Allows the app to prevent the phone from going to sleep.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_transmitIr">transmit infrared</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_transmitIr" product="tablet">Allows the app to use the tablet\'s infrared transmitter.</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_transmitIr" product="default">Allows the app to use the phone\'s infrared transmitter.</string> + + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_devicePower" product="tablet">power tablet on or off</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_devicePower" product="default">power phone on or off</string> |