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

Commit 9163d42a authored by Mike Lockwood's avatar Mike Lockwood
Browse files

DO NOT MERGE Add new permission to allow access to USB devices 



Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.

Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 51e895f0

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -436,6 +436,14 @@ 
        android:label="@string/permlab_flashlight"

        android:description="@string/permdesc_flashlight" />



    <!-- Allows an application to access USB devices

         @hide -->

    <permission android:name="android.permission.ACCESS_USB"

        android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_accessUsb"

        android:description="@string/permdesc_accessUsb" />



    <!-- Allows access to hardware peripherals.  Intended only for hardware testing -->

    <permission android:name="android.permission.HARDWARE_TEST"

        android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -938,6 +938,11 @@ 
    <string name="permdesc_flashlight">Allows the application to control

        the flashlight.</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_accessUsb">access USB devices</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_accessUsb">Allows the application to access USB devices.</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_hardware_test">test hardware</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->