Include USB device version in chrome.usb.Device fields.

device/usb/usb_device_android.cc

Index: device/usb/usb_device_android.cc
diff --git a/device/usb/usb_device_android.cc b/device/usb/usb_device_android.cc
index b1a2baacdd99f9c02ae94f883b40ece4a97f5b94..02f18d9c2352883cfb7f5bd160d4125f00b5bc85 100644
--- a/device/usb/usb_device_android.cc
+++ b/device/usb/usb_device_android.cc
@@ -32,8 +32,6 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
     const JavaRef<jobject>& usb_device) {
   ScopedJavaLocalRef<jobject> wrapper =
       Java_ChromeUsbDevice_create(env, usb_device.obj());
-  uint16_t vendor_id = Java_ChromeUsbDevice_getVendorId(env, wrapper.obj());
-  uint16_t product_id = Java_ChromeUsbDevice_getProductId(env, wrapper.obj());
   ScopedJavaLocalRef<jstring> manufacturer_string =
       Java_ChromeUsbDevice_getManufacturerName(env, wrapper.obj());
   ScopedJavaLocalRef<jstring> product_string =
@@ -41,7 +39,14 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
   ScopedJavaLocalRef<jstring> serial_number =
       Java_ChromeUsbDevice_getSerialNumber(env, wrapper.obj());
   return make_scoped_refptr(new UsbDeviceAndroid(
-      env, vendor_id, product_id,
+      env,
+      0x0200,  // USB protocol version, not provided by the Android API.
+      Java_ChromeUsbDevice_getDeviceClass(env, wrapper.obj()),
+      Java_ChromeUsbDevice_getDeviceSubclass(env, wrapper.obj()),
+      Java_ChromeUsbDevice_getDeviceProtocol(env, wrapper.obj()),
+      Java_ChromeUsbDevice_getVendorId(env, wrapper.obj()),
+      Java_ChromeUsbDevice_getProductId(env, wrapper.obj()),
+      0x0000,  // Device version, not available until API version 23.

[asargent_no_longer_on_chrome, 2016/04/05 21:31:16]

Out of curiousity, is it possible to have a method in ChromeUsbDevice.java which
checks the API version at runtime and either returns 0x0000 or the actual value,
as appropriate?

       ConvertJavaStringToUTF16(env, manufacturer_string),
       ConvertJavaStringToUTF16(env, product_string),
       ConvertJavaStringToUTF16(env, serial_number), wrapper));
@@ -57,14 +62,24 @@ const UsbConfigDescriptor* UsbDeviceAndroid::GetActiveConfiguration() const {
 }
 
 UsbDeviceAndroid::UsbDeviceAndroid(JNIEnv* env,
+                                   uint16_t usb_version,
+                                   uint8_t device_class,
+                                   uint8_t device_subclass,
+                                   uint8_t device_protocol,
                                    uint16_t vendor_id,
                                    uint16_t product_id,
+                                   uint16_t device_version,
                                    const base::string16& manufacturer_string,
                                    const base::string16& product_string,
                                    const base::string16& serial_number,
                                    const JavaRef<jobject>& wrapper)
-    : UsbDevice(vendor_id,
+    : UsbDevice(usb_version,
+                device_class,
+                device_subclass,
+                device_protocol,
+                vendor_id,
                 product_id,
+                device_version,
                 manufacturer_string,
                 product_string,
                 serial_number) {