Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10ce90ad authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

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

* commit 'eaebe4c1':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
parents 56f7afb0 eaebe4c1

core/res/AndroidManifest.xml

+9 −0
Original line number Original line Diff line number Diff line
@@ -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 -->

    <!-- =========================================== -->

    <!-- =========================================== -->

core/res/res/values/strings.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -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>