Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev

Browse Source 
* commit 'eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
This commit is contained in:
Igor Murashkin
2013-04-25 16:57:49 -07:00
committed by Android Git Automerger
parent 56f7afb056 eaebe4c106
commit 10ce90adfa
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/AndroidManifest.xml
View File

@@ -938,6 +938,15 @@
android:label="@string/permlab_camera" android:label="@string/permlab_camera"
android:description="@string/permdesc_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 --> <!-- Permissions associated with telephony state -->
<!-- =========================================== --> <!-- =========================================== -->

4
core/res/res/values/strings.xml
View File

@@ -1377,6 +1377,10 @@
<string name="permdesc_camera">Allows the app to take pictures and videos <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 with the camera. This permission allows the app to use the camera at any
time without your confirmation.</string> 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. --> <!-- 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> <string name="permlab_brick" product="tablet">permanently disable tablet</string>