diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-16 12:42:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-16 12:42:35 -0800 |
| commit | 984dd8a206e782027c2b0c866aa845e6d236f218 (patch) | |
| tree | bc19dd5e86fe963321b06b72b09479a6a6725907 /api | |
| parent | ca20af0c2990a969f1a793821d2ee239b0310d45 (diff) | |
| parent | 9182d3c4eb1f9065cb33df5a3594969dd0d42acc (diff) | |
| download | frameworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.zip frameworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.tar.gz frameworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.tar.bz2 | |
Merge "UsbManager: New APIs for USB accessories"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 209 |
1 files changed, 206 insertions, 3 deletions
diff --git a/api/current.xml b/api/current.xml index b136915..3164a09 100644 --- a/api/current.xml +++ b/api/current.xml @@ -94108,6 +94108,97 @@ > </field> </class> +<class name="UsbAccessory" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getManufacturer" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getModel" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getType" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getVersion" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parcel" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="UsbConstants" extends="java.lang.Object" abstract="false" @@ -95058,6 +95149,17 @@ deprecated="not deprecated" visibility="public" > +<method name="getAccessoryList" + return="android.hardware.UsbAccessory[]" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getDeviceList" return="java.util.HashMap<java.lang.String, android.hardware.UsbDevice>" abstract="false" @@ -95095,6 +95197,19 @@ <parameter name="function" type="java.lang.String"> </parameter> </method> +<method name="openAccessory" + return="android.os.ParcelFileDescriptor" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="accessory" type="android.hardware.UsbAccessory"> +</parameter> +</method> <method name="openDevice" return="boolean" abstract="false" @@ -95108,6 +95223,28 @@ <parameter name="device" type="android.hardware.UsbDevice"> </parameter> </method> +<field name="ACTION_USB_ACCESSORY_ATTACHED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.action.USB_ACCESSORY_ATTACHED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_USB_ACCESSORY_DETACHED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.action.USB_ACCESSORY_DETACHED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_USB_DEVICE_ATTACHED" type="java.lang.String" transient="false" @@ -95141,6 +95278,61 @@ visibility="public" > </field> +<field name="EXTRA_ACCESSORY" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_ACCESSORY_MANUFACTURER" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory-manufacturer"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_ACCESSORY_PRODUCT" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory-product"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_ACCESSORY_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory-type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_ACCESSORY_VERSION" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory-version"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="EXTRA_DEVICE" type="java.lang.String" transient="false" @@ -95240,6 +95432,17 @@ visibility="public" > </field> +<field name="USB_FUNCTION_ACCESSORY" + type="java.lang.String" + transient="false" + volatile="false" + value=""accessory"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="USB_FUNCTION_ADB" type="java.lang.String" transient="false" @@ -237385,7 +237588,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="s" type="java.lang.String"> +<parameter name="key" type="java.lang.String"> </parameter> </method> <method name="describeContents" @@ -237420,7 +237623,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="s" type="java.lang.String"> +<parameter name="key" type="java.lang.String"> </parameter> </method> <method name="getIconResId" @@ -265596,7 +265799,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> |