summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-05-10 18:26:40 -0400
committerMike Lockwood <lockwood@android.com>2010-05-11 08:29:19 -0400
commit31ac8e9d56d121e276f0c9e2359c28fefb3e80cf (patch)
tree342c94cdf33521ac3448e153501a550b90ec6ce8
parent91882c4731e9b9fffee14f41011202d26c207e3a (diff)
downloadframeworks_base-31ac8e9d56d121e276f0c9e2359c28fefb3e80cf.zip
frameworks_base-31ac8e9d56d121e276f0c9e2359c28fefb3e80cf.tar.gz
frameworks_base-31ac8e9d56d121e276f0c9e2359c28fefb3e80cf.tar.bz2
Add new permission android.permission.ACCESS_USB to allow access to USB devices
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--core/res/AndroidManifest.xml8
-rw-r--r--core/res/res/values/strings.xml5
-rw-r--r--data/etc/platform.xml4
3 files changed, 17 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index db71b21..ccfeae3 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b999010..3608b6f 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -930,6 +930,11 @@
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. -->
<string name="permdesc_hardware_test">Allows the application to control
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 7322e6c..0e5df8c 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -58,6 +58,10 @@
<group gid="sdcard_rw" />
</permission>
+ <permission name="android.permission.ACCESS_USB" >
+ <group gid="usb" />
+ </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" >