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

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

Browse Source
This commit is contained in:
Mike Lockwood
2011-01-10 09:24:46 -08:00
committed by Android (Google) Code Review
parent aa6b9f55d6 10bc1114f3
commit 5e63e2515f
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/AndroidManifest.xml
View File

@@ -470,6 +470,15 @@
android:label="@string/permlab_accessUsb" android:label="@string/permlab_accessUsb"
android:description="@string/permdesc_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 --> <!-- Allows access to hardware peripherals. Intended only for hardware testing -->
<permission android:name="android.permission.HARDWARE_TEST" <permission android:name="android.permission.HARDWARE_TEST"
android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"

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

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

4
data/etc/platform.xml
View File

@@ -66,6 +66,10 @@
<group gid="usb" /> <group gid="usb" />
</permission> </permission>
<permission name="android.permission.ACCESS_MTP" >
<group gid="mtp" />
</permission>
<!-- The group that /cache belongs to, linked to the permission <!-- The group that /cache belongs to, linked to the permission
set on the applications that can access /cache --> set on the applications that can access /cache -->
<permission name="android.permission.ACCESS_CACHE_FILESYSTEM" > <permission name="android.permission.ACCESS_CACHE_FILESYSTEM" >