diff options
Diffstat (limited to 'api/current.xml')
| -rw-r--r-- | api/current.xml | 607 |
1 files changed, 100 insertions, 507 deletions
diff --git a/api/current.xml b/api/current.xml index ace309b..fb4cdde 100644 --- a/api/current.xml +++ b/api/current.xml @@ -94880,13 +94880,13 @@ extends="java.lang.Object" abstract="false" static="false" - final="true" + final="false" deprecated="not deprecated" visibility="public" > <implements name="android.os.Parcelable"> </implements> -<method name="bulkTransfer" +<method name="describeContents" return="int" abstract="false" native="false" @@ -94896,17 +94896,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="endpoint" type="android.hardware.usb.UsbEndpoint"> -</parameter> -<parameter name="buffer" type="byte[]"> -</parameter> -<parameter name="length" type="int"> -</parameter> -<parameter name="timeout" type="int"> -</parameter> </method> -<method name="claimInterface" - return="boolean" +<method name="getDeviceClass" + return="int" abstract="false" native="false" synchronized="false" @@ -94915,13 +94907,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="intf" type="android.hardware.usb.UsbInterface"> -</parameter> -<parameter name="force" type="boolean"> -</parameter> </method> -<method name="close" - return="void" +<method name="getDeviceId" + return="int" abstract="false" native="false" synchronized="false" @@ -94931,33 +94919,21 @@ visibility="public" > </method> -<method name="controlTransfer" +<method name="getDeviceId" return="int" abstract="false" native="false" synchronized="false" - static="false" + static="true" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="requestType" type="int"> -</parameter> -<parameter name="request" type="int"> -</parameter> -<parameter name="value" type="int"> -</parameter> -<parameter name="index" type="int"> -</parameter> -<parameter name="buffer" type="byte[]"> -</parameter> -<parameter name="length" type="int"> -</parameter> -<parameter name="timeout" type="int"> +<parameter name="name" type="java.lang.String"> </parameter> </method> -<method name="describeContents" - return="int" +<method name="getDeviceName" + return="java.lang.String" abstract="false" native="false" synchronized="false" @@ -94967,18 +94943,20 @@ visibility="public" > </method> -<method name="getDeviceClass" - return="int" +<method name="getDeviceName" + return="java.lang.String" abstract="false" native="false" synchronized="false" - static="false" + static="true" final="false" deprecated="not deprecated" visibility="public" > +<parameter name="id" type="int"> +</parameter> </method> -<method name="getDeviceId" +<method name="getDeviceProtocol" return="int" abstract="false" native="false" @@ -94989,21 +94967,19 @@ visibility="public" > </method> -<method name="getDeviceId" +<method name="getDeviceSubclass" return="int" abstract="false" native="false" synchronized="false" - static="true" + static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="name" type="java.lang.String"> -</parameter> </method> -<method name="getDeviceName" - return="java.lang.String" +<method name="getInterface" + return="android.hardware.usb.UsbInterface" abstract="false" native="false" synchronized="false" @@ -95012,21 +94988,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="index" type="int"> +</parameter> </method> -<method name="getDeviceName" - return="java.lang.String" +<method name="getInterfaceCount" + return="int" abstract="false" native="false" synchronized="false" - static="true" + static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="id" type="int"> -</parameter> </method> -<method name="getDeviceProtocol" +<method name="getProductId" return="int" abstract="false" native="false" @@ -95037,7 +95013,7 @@ visibility="public" > </method> -<method name="getDeviceSubclass" +<method name="getVendorId" return="int" abstract="false" native="false" @@ -95048,8 +95024,8 @@ visibility="public" > </method> -<method name="getFileDescriptor" - return="int" +<method name="writeToParcel" + return="void" abstract="false" native="false" synchronized="false" @@ -95058,21 +95034,31 @@ deprecated="not deprecated" visibility="public" > +<parameter name="parcel" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> </method> -<method name="getInterface" - return="android.hardware.usb.UsbInterface" +<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="UsbDeviceConnection" + extends="java.lang.Object" abstract="false" - native="false" - synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="index" type="int"> -</parameter> -</method> -<method name="getInterfaceCount" +<method name="bulkTransfer" return="int" abstract="false" native="false" @@ -95082,9 +95068,17 @@ deprecated="not deprecated" visibility="public" > +<parameter name="endpoint" type="android.hardware.usb.UsbEndpoint"> +</parameter> +<parameter name="buffer" type="byte[]"> +</parameter> +<parameter name="length" type="int"> +</parameter> +<parameter name="timeout" type="int"> +</parameter> </method> -<method name="getProductId" - return="int" +<method name="claimInterface" + return="boolean" abstract="false" native="false" synchronized="false" @@ -95093,9 +95087,13 @@ deprecated="not deprecated" visibility="public" > +<parameter name="intf" type="android.hardware.usb.UsbInterface"> +</parameter> +<parameter name="force" type="boolean"> +</parameter> </method> -<method name="getSerial" - return="java.lang.String" +<method name="close" + return="void" abstract="false" native="false" synchronized="false" @@ -95105,7 +95103,7 @@ visibility="public" > </method> -<method name="getVendorId" +<method name="controlTransfer" return="int" abstract="false" native="false" @@ -95115,9 +95113,23 @@ deprecated="not deprecated" visibility="public" > +<parameter name="requestType" type="int"> +</parameter> +<parameter name="request" type="int"> +</parameter> +<parameter name="value" type="int"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="buffer" type="byte[]"> +</parameter> +<parameter name="length" type="int"> +</parameter> +<parameter name="timeout" type="int"> +</parameter> </method> -<method name="releaseInterface" - return="boolean" +<method name="getFileDescriptor" + return="int" abstract="false" native="false" synchronized="false" @@ -95126,11 +95138,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="intf" type="android.hardware.usb.UsbInterface"> -</parameter> </method> -<method name="requestWait" - return="android.hardware.usb.UsbRequest" +<method name="getSerial" + return="java.lang.String" abstract="false" native="false" synchronized="false" @@ -95140,8 +95150,8 @@ visibility="public" > </method> -<method name="writeToParcel" - return="void" +<method name="releaseInterface" + return="boolean" abstract="false" native="false" synchronized="false" @@ -95150,27 +95160,26 @@ deprecated="not deprecated" visibility="public" > -<parameter name="parcel" type="android.os.Parcel"> -</parameter> -<parameter name="flags" type="int"> +<parameter name="intf" type="android.hardware.usb.UsbInterface"> </parameter> </method> -<field name="CREATOR" - type="android.os.Parcelable.Creator" - transient="false" - volatile="false" - static="true" - final="true" +<method name="requestWait" + return="android.hardware.usb.UsbRequest" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" deprecated="not deprecated" visibility="public" > -</field> +</method> </class> <class name="UsbEndpoint" extends="java.lang.Object" abstract="false" static="false" - final="true" + final="false" deprecated="not deprecated" visibility="public" > @@ -95209,17 +95218,6 @@ visibility="public" > </method> -<method name="getDevice" - return="android.hardware.usb.UsbDevice" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="getDirection" return="int" abstract="false" @@ -95242,17 +95240,6 @@ visibility="public" > </method> -<method name="getInterface" - return="android.hardware.usb.UsbInterface" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="getInterval" return="int" abstract="false" @@ -95333,17 +95320,6 @@ visibility="public" > </method> -<method name="getDevice" - return="android.hardware.usb.UsbDevice" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="getEndpoint" return="android.hardware.usb.UsbEndpoint" abstract="false" @@ -95494,32 +95470,6 @@ <parameter name="accessory" type="android.hardware.usb.UsbAccessory"> </parameter> </method> -<method name="isFunctionEnabled" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="function" type="java.lang.String"> -</parameter> -</method> -<method name="isFunctionSupported" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="function" type="java.lang.String"> -</parameter> -</method> <method name="openAccessory" return="android.os.ParcelFileDescriptor" abstract="false" @@ -95534,7 +95484,7 @@ </parameter> </method> <method name="openDevice" - return="boolean" + return="android.hardware.usb.UsbDeviceConnection" abstract="false" native="false" synchronized="false" @@ -95620,17 +95570,6 @@ visibility="public" > </field> -<field name="ACTION_USB_STATE" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.hardware.usb.action.USB_STATE"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="EXTRA_ACCESSORY" type="java.lang.String" transient="false" @@ -95664,105 +95603,6 @@ visibility="public" > </field> -<field name="USB_CONFIGURATION" - type="java.lang.String" - transient="false" - volatile="false" - value=""configuration"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_CONNECTED" - type="java.lang.String" - transient="false" - volatile="false" - value=""connected"" - static="true" - final="true" - deprecated="not deprecated" - 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" - volatile="false" - value=""adb"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_FUNCTION_DISABLED" - type="java.lang.String" - transient="false" - volatile="false" - value=""disabled"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_FUNCTION_ENABLED" - type="java.lang.String" - transient="false" - volatile="false" - value=""enabled"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_FUNCTION_MASS_STORAGE" - type="java.lang.String" - transient="false" - volatile="false" - value=""mass_storage"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_FUNCTION_MTP" - type="java.lang.String" - transient="false" - volatile="false" - value=""mtp"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="USB_FUNCTION_RNDIS" - type="java.lang.String" - transient="false" - volatile="false" - value=""rndis"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> </class> <class name="UsbRequest" extends="java.lang.Object" @@ -95834,6 +95674,8 @@ deprecated="not deprecated" visibility="public" > +<parameter name="connection" type="android.hardware.usb.UsbDeviceConnection"> +</parameter> <parameter name="endpoint" type="android.hardware.usb.UsbEndpoint"> </parameter> </method> @@ -112607,255 +112449,6 @@ </package> <package name="android.mtp" > -<class name="MtpClient" - extends="java.lang.Object" - abstract="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<constructor name="MtpClient" - type="android.mtp.MtpClient" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> -</parameter> -</constructor> -<method name="addListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="listener" type="android.mtp.MtpClient.Listener"> -</parameter> -</method> -<method name="close" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="deleteObject" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -</method> -<method name="getDevice" - return="android.mtp.MtpDevice" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -</method> -<method name="getDevice" - return="android.mtp.MtpDevice" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="id" type="int"> -</parameter> -</method> -<method name="getDeviceList" - return="java.util.List<android.mtp.MtpDevice>" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getObject" - return="byte[]" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -<parameter name="objectSize" type="int"> -</parameter> -</method> -<method name="getObjectInfo" - return="android.mtp.MtpObjectInfo" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -</method> -<method name="getObjectList" - return="java.util.List<android.mtp.MtpObjectInfo>" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="storageId" type="int"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -</method> -<method name="getStorageList" - return="java.util.List<android.mtp.MtpStorageInfo>" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -</method> -<method name="getThumbnail" - return="byte[]" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -</method> -<method name="importFile" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="deviceName" type="java.lang.String"> -</parameter> -<parameter name="objectHandle" type="int"> -</parameter> -<parameter name="destPath" type="java.lang.String"> -</parameter> -</method> -<method name="isCamera" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="device" type="android.hardware.usb.UsbDevice"> -</parameter> -</method> -<method name="removeListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="listener" type="android.mtp.MtpClient.Listener"> -</parameter> -</method> -</class> -<interface name="MtpClient.Listener" - abstract="true" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<method name="deviceAdded" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="device" type="android.mtp.MtpDevice"> -</parameter> -</method> -<method name="deviceRemoved" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="device" type="android.mtp.MtpDevice"> -</parameter> -</method> -</interface> <class name="MtpConstants" extends="java.lang.Object" abstract="false" @@ -113765,7 +113358,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="manager" type="android.hardware.usb.UsbManager"> +<parameter name="connection" type="android.hardware.usb.UsbDeviceConnection"> </parameter> </method> </class> @@ -267438,7 +267031,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> |