diff options
| author | 2010-05-10 18:26:40 -0400 | |
|---|---|---|
| committer | 2010-06-24 09:36:35 -0400 | |
| commit | 9163d42a50076c2a77694ff394363264d862c7bf (patch) | |
| tree | 02c32c22b67ed6761fd512d7c22ce044431b1590 | |
| parent | 51e895f055f76ad0114a18e1b754a1475a62c524 (diff) | |
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: Mike Lockwood <lockwood@android.com>
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index aff94531a16c..a9dbaedf20d5 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 3c1fdbc68dd9..44317bc5fb63 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -939,6 +939,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 |