Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b46ecb35 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 

* commit '75c95e9a':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
parents 08758fad 75c95e9a

api/current.xml

+129 −536
Original line number Diff line number Diff line
@@ -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"
@@ -95557,206 +95507,96 @@ 
 visibility="public"

>

<parameter name="device" type="android.hardware.usb.UsbDevice">

</parameter>

<parameter name="pi" type="android.app.PendingIntent">

</parameter>

</method>

<method name="requestPermission"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="accessory" type="android.hardware.usb.UsbAccessory">

</parameter>

<parameter name="pi" type="android.app.PendingIntent">

</parameter>

</method>

<field name="ACTION_USB_ACCESSORY_ATTACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.usb.action.USB_ACCESSORY_ATTACHED&quot;"

 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="&quot;android.hardware.usb.action.USB_ACCESSORY_DETACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_USB_DEVICE_ATTACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.usb.action.USB_DEVICE_ATTACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_USB_DEVICE_DETACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.usb.action.USB_DEVICE_DETACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_USB_STATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.usb.action.USB_STATE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_ACCESSORY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;accessory&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_DEVICE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;device&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_PERMISSION_GRANTED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;permission&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_CONFIGURATION"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;configuration&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_CONNECTED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;connected&quot;"

 static="true"

 final="true"

</parameter>

<parameter name="pi" type="android.app.PendingIntent">

</parameter>

</method>

<method name="requestPermission"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ACCESSORY"

<parameter name="accessory" type="android.hardware.usb.UsbAccessory">

</parameter>

<parameter name="pi" type="android.app.PendingIntent">

</parameter>

</method>

<field name="ACTION_USB_ACCESSORY_ATTACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;accessory&quot;"

 value="&quot;android.hardware.usb.action.USB_ACCESSORY_ATTACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ADB"

<field name="ACTION_USB_ACCESSORY_DETACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;adb&quot;"

 value="&quot;android.hardware.usb.action.USB_ACCESSORY_DETACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_DISABLED"

<field name="ACTION_USB_DEVICE_ATTACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;disabled&quot;"

 value="&quot;android.hardware.usb.action.USB_DEVICE_ATTACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ENABLED"

<field name="ACTION_USB_DEVICE_DETACHED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;enabled&quot;"

 value="&quot;android.hardware.usb.action.USB_DEVICE_DETACHED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_MASS_STORAGE"

<field name="EXTRA_ACCESSORY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mass_storage&quot;"

 value="&quot;accessory&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_MTP"

<field name="EXTRA_DEVICE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mtp&quot;"

 value="&quot;device&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_RNDIS"

<field name="EXTRA_PERMISSION_GRANTED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;rndis&quot;"

 value="&quot;permission&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -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>
@@ -112662,255 +112504,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&lt;android.mtp.MtpDevice&gt;"

 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&lt;android.mtp.MtpObjectInfo&gt;"

 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&lt;android.mtp.MtpStorageInfo&gt;"

 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"
@@ -113820,7 +113413,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>

core/java/android/hardware/usb/UsbDevice.java

+9 −141

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/usb/UsbDeviceConnection.java

0 → 100644
+163 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/usb/UsbEndpoint.java

+5 −32
Original line number Diff line number Diff line
@@ -23,16 +23,12 @@ import android.os.Parcelable; 
/**

 * A class representing an endpoint on a {@link android.hardware.usb.UsbInterface}.

 */

public final class UsbEndpoint implements Parcelable {

public class UsbEndpoint implements Parcelable {



    private int mAddress;

    private int mAttributes;

    private int mMaxPacketSize;

    private int mInterval;

    private UsbInterface mInterface;



    private UsbEndpoint() {

    }

    private final int mAddress;

    private final int mAttributes;

    private final int mMaxPacketSize;

    private final int mInterval;



    /**

     * UsbEndpoint should only be instantiated by UsbService implementation
@@ -119,29 +115,6 @@ public final class UsbEndpoint implements Parcelable { 
        return mInterval;

    }



    /**

     * Returns the {@link android.hardware.usb.UsbInterface} this endpoint belongs to.

     *

     * @return the endpoint's interface

     */

    public UsbInterface getInterface() {

        return mInterface;

    }



    /**

     * Returns the {@link android.hardware.usb.UsbDevice} this endpoint belongs to.

     *

     * @return the endpoint's device

     */

    public UsbDevice getDevice() {

        return mInterface.getDevice();

    }



    // only used for parcelling

    /* package */ void setInterface(UsbInterface intf) {

        mInterface = intf;

    }



    @Override

    public String toString() {

        return "UsbEndpoint[mAddress=" + mAddress + ",mAttributes=" + mAttributes +

core/java/android/hardware/usb/UsbInterface.java

+6 −28
Original line number Diff line number Diff line
@@ -25,15 +25,11 @@ import android.os.Parcelable; 
 */

public class UsbInterface implements Parcelable {



    private int mId;

    private int mClass;

    private int mSubclass;

    private int mProtocol;

    private UsbDevice mDevice;

    private Parcelable[] mEndpoints;



    private UsbInterface() {

    }

    private final int mId;

    private final int mClass;

    private final int mSubclass;

    private final int mProtocol;

    private final Parcelable[] mEndpoints;



    /**

     * UsbInterface should only be instantiated by UsbService implementation
@@ -104,20 +100,6 @@ public class UsbInterface implements Parcelable { 
        return (UsbEndpoint)mEndpoints[index];

    }



    /**

     * Returns the {@link android.hardware.usb.UsbDevice} this interface belongs to.

     *

     * @return the interface's device

     */

    public UsbDevice getDevice() {

        return mDevice;

    }



    // only used for parcelling

    /* package */ void setDevice(UsbDevice device) {

        mDevice = device;

    }



    @Override

    public String toString() {

        return "UsbInterface[mId=" + mId + ",mClass=" + mClass +
@@ -133,11 +115,7 @@ public class UsbInterface implements Parcelable { 
            int subClass = in.readInt();

            int protocol = in.readInt();

            Parcelable[] endpoints = in.readParcelableArray(UsbEndpoint.class.getClassLoader());

            UsbInterface result = new UsbInterface(id, Class, subClass, protocol, endpoints);

            for (int i = 0; i < endpoints.length; i++) {

                ((UsbEndpoint)endpoints[i]).setInterface(result);

            }

            return result;

            return new UsbInterface(id, Class, subClass, protocol, endpoints);

        }



        public UsbInterface[] newArray(int size) {