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

device/usb/usb_device_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/usb/usb_device_android.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 14 matching lines @@
 bool UsbDeviceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in ChromeUsbDevice_jni.h
 }
 
 // static
 scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
     JNIEnv* env,
     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 =
       Java_ChromeUsbDevice_getProductName(env, wrapper.obj());
   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));
 }
 
 void UsbDeviceAndroid::Open(const OpenCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback, nullptr));
 }
 
 const UsbConfigDescriptor* UsbDeviceAndroid::GetActiveConfiguration() const {
   return nullptr;
 }
 
 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) {
   j_object_.Reset(wrapper);
 
   if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
     ScopedJavaLocalRef<jobjectArray> configurations =
         Java_ChromeUsbDevice_getConfigurations(env, j_object_.obj());
     jsize count = env->GetArrayLength(configurations.obj());
     configurations_.reserve(count);
@@ skipping 19 matching lines @@
           env, env->GetObjectArrayElement(interfaces.obj(), i));
       config.interfaces.push_back(UsbInterfaceAndroid::Convert(env, interface));
     }
     configurations_.push_back(config);
   }
 }
 
 UsbDeviceAndroid::~UsbDeviceAndroid() {}
 
 }  // namespace device