Check Android API level when using usb.UsbDevice.getManufacturerName

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 53873a994c87cb37e2b132d0393b0b1cf3cede8a..ca7192fb288e246665f8b10f5700791a1c9cdd09 100644
--- a/device/usb/usb_device_android.cc
+++ b/device/usb/usb_device_android.cc
@@ -35,12 +35,15 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
   uint16_t device_version = 0;
   if (base::android::BuildInfo::GetInstance()->sdk_int() >= 23)
     device_version = Java_ChromeUsbDevice_getDeviceVersion(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());
+  base::string16 manufacturer_string, product_string, serial_number;
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
+    manufacturer_string = ConvertJavaStringToUTF16(
+        env, Java_ChromeUsbDevice_getManufacturerName(env, wrapper.obj()));
+    product_string = ConvertJavaStringToUTF16(
+        env, Java_ChromeUsbDevice_getProductName(env, wrapper.obj()));
+    serial_number = ConvertJavaStringToUTF16(
+        env, Java_ChromeUsbDevice_getSerialNumber(env, wrapper.obj()));
+  }
   return make_scoped_refptr(new UsbDeviceAndroid(
       env,
       0x0200,  // USB protocol version, not provided by the Android API.
@@ -49,9 +52,7 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
       Java_ChromeUsbDevice_getDeviceProtocol(env, wrapper.obj()),
       Java_ChromeUsbDevice_getVendorId(env, wrapper.obj()),
       Java_ChromeUsbDevice_getProductId(env, wrapper.obj()), device_version,
-      ConvertJavaStringToUTF16(env, manufacturer_string),
-      ConvertJavaStringToUTF16(env, product_string),
-      ConvertJavaStringToUTF16(env, serial_number), wrapper));
+      manufacturer_string, product_string, serial_number, wrapper));
 }
 
 void UsbDeviceAndroid::Open(const OpenCallback& callback) {