From 97d7e4c227ca26c125c1b587c5ed04ab82d0f4e1 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Fri, 7 Jan 2011 12:37:54 -0500
Subject: [PATCH] Make ACCESS_USB permission for applications to access USB
 devices:

- change from signatureOrSystem to normal
- no longer associate this permission with the "usb" unix group
- add to public API

Change-Id: I3be3a5d138719dd126ff0a798824a77f9ce79e24
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 api/current.xml              | 11 +++++++++++
 core/res/AndroidManifest.xml |  5 ++---
 data/etc/platform.xml        |  4 ----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 6af5fc03b7e88..d665bcac91a5f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -111,6 +111,17 @@
  visibility="public"
 >
 </field>
+<field name="ACCESS_USB"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.permission.ACCESS_USB&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="ACCESS_WIFI_STATE"
  type="java.lang.String"
  transient="false"
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index a184a5c922059..34d8d29cbedb3 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -464,11 +464,10 @@
         android:label="@string/permlab_flashlight"
         android:description="@string/permdesc_flashlight" />
 
-    <!-- Allows an application to access USB devices
-         @hide -->
+    <!-- Allows an application to access USB devices -->
     <permission android:name="android.permission.ACCESS_USB"
         android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"
-        android:protectionLevel="signatureOrSystem"
+        android:protectionLevel="normal"
         android:label="@string/permlab_accessUsb"
         android:description="@string/permdesc_accessUsb" />
 
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index ea91c218b6058..df80546688fad 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -58,10 +58,6 @@
         <group gid="sdcard_rw" />
     </permission>
 
-    <permission name="android.permission.ACCESS_USB" >
-        <group gid="usb" />
-    </permission>
-
     <permission name="android.permission.ACCESS_MTP" >
         <group gid="mtp" />
     </permission>