UsbDevice: Move IO related methods to new UsbDeviceConnection class

UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>

1 files changed, 100 insertions, 122 deletions

diff --git a/api/current.xml b/api/current.xml
index ace309b..b2e71fa 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"
@@ -95534,7 +95510,7 @@
 </parameter>
 </method>
 <method name="openDevice"
- return="boolean"
+ return="android.hardware.usb.UsbDeviceConnection"
  abstract="false"
  native="false"
  synchronized="false"
@@ -95834,6 +95810,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>
@@ -113765,7 +113743,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 +267416,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>