Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: device/usb/usb_interface_android.cc

Issue 2041553002: Check Android version before calling UsbInterface.getAlternateSetting() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_interface_android.cc
diff --git a/device/usb/usb_interface_android.cc b/device/usb/usb_interface_android.cc
index fefe6713f9a40ab93fb35479b0dd9b99d6d34d25..047b035058ac7f51ae1c7eeba1b9f0c05216285c 100644
--- a/device/usb/usb_interface_android.cc
+++ b/device/usb/usb_interface_android.cc
@@ -4,6 +4,7 @@
#include "device/usb/usb_interface_android.h"
+#include "base/android/build_info.h"
#include "device/usb/usb_endpoint_android.h"
#include "jni/ChromeUsbInterface_jni.h"
@@ -23,9 +24,15 @@ UsbInterfaceDescriptor UsbInterfaceAndroid::Convert(
ScopedJavaLocalRef<jobject> wrapper =
Java_ChromeUsbInterface_create(env, usb_interface.obj());
+ uint8_t alternate_setting = 0;
+ if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
+ alternate_setting =
+ Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj());
+ }
+
UsbInterfaceDescriptor interface(
Java_ChromeUsbInterface_getInterfaceNumber(env, wrapper.obj()),
- Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj()),
+ alternate_setting,
Java_ChromeUsbInterface_getInterfaceClass(env, wrapper.obj()),
Java_ChromeUsbInterface_getInterfaceSubclass(env, wrapper.obj()),
Java_ChromeUsbInterface_getInterfaceProtocol(env, wrapper.obj()));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698