diff options
| author | Igor Murashkin <iam@google.com> | 2013-04-23 14:32:19 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-04-24 15:08:12 -0700 |
| commit | f640bb9bbbe104fd08c98df240f1aeea0cacdbab (patch) | |
| tree | d825daea5167f3c879978c460d0b1f905bcf40f7 /core/res | |
| parent | 51f7ca4521c3508a233eefe97f53092213eacb60 (diff) | |
| download | frameworks_base-f640bb9bbbe104fd08c98df240f1aeea0cacdbab.zip frameworks_base-f640bb9bbbe104fd08c98df240f1aeea0cacdbab.tar.gz frameworks_base-f640bb9bbbe104fd08c98df240f1aeea0cacdbab.tar.bz2 | |
Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
This system-only permission allows a service to disable the transmit LED
when a camera is in use.
Bug: 8554573
Change-Id: I64f7e3fcdc8ded8be3904650bd0c91d3b8f10dd4
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index cb14374..d2895b7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -938,6 +938,15 @@ android:label="@string/permlab_camera" android:description="@string/permdesc_camera" /> + <!-- Allows disabling the transmit-indicator LED that is normally on when + a camera is in use by an application. + @hide --> + <permission android:name="android.permission.CAMERA_DISABLE_TRANSMIT_LED" + android:permissionGroup="android.permission-group.CAMERA" + android:protectionLevel="signature|system" + android:label="@string/permlab_cameraDisableTransmitLed" + android:description="@string/permdesc_cameraDisableTransmitLed" /> + <!-- =========================================== --> <!-- Permissions associated with telephony state --> <!-- =========================================== --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index db9602a..a51371f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1377,6 +1377,10 @@ <string name="permdesc_camera">Allows the app to take pictures and videos with the camera. This permission allows the app to use the camera at any time without your confirmation.</string> + <!-- Title of a camera app permission, listed so the user can choose whether or not they want to allow it to disable the may-transmit light indicator. --> + <string name="permlab_cameraDisableTransmitLed">disable transmit indicator LED when camera is in use</string> + <!-- Description of a camera app permission, listed so the user can choose whether or not they want to allow it to disable the may-transmit light indicator. --> + <string name="permdesc_cameraDisableTransmitLed">Allows a pre-installed system application to disable the camera use indicator LED.</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_brick" product="tablet">permanently disable tablet</string> |