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

Commit 5e63e251 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb

parents aa6b9f55 10bc1114

core/res/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -470,6 +470,15 @@ 
        android:label="@string/permlab_accessUsb"

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



    <!-- Allows an application to access the MTP USB kernel driver.

         For use only by the device side MTP implementation.

         @hide -->

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

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

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_accessMtp"

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



    <!-- 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
@@ -1029,6 +1029,11 @@ 
    <!-- 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_accessMtp">implement MTP protocol</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_accessMtp">Allows access to the kernel MTP driver to implement the MTP USB protocol.</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. -->

data/etc/platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
        <group gid="usb" />

    </permission>



    <permission name="android.permission.ACCESS_MTP" >

        <group gid="mtp" />

    </permission>



    <!-- The group that /cache belongs to, linked to the permission

         set on the applications that can access /cache -->

    <permission name="android.permission.ACCESS_CACHE_FILESYSTEM" >