OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "device/usb/usb_interface_android.h" | 5 #include "device/usb/usb_interface_android.h" |
6 | 6 |
| 7 #include "base/android/build_info.h" |
7 #include "device/usb/usb_endpoint_android.h" | 8 #include "device/usb/usb_endpoint_android.h" |
8 #include "jni/ChromeUsbInterface_jni.h" | 9 #include "jni/ChromeUsbInterface_jni.h" |
9 | 10 |
10 using base::android::ScopedJavaLocalRef; | 11 using base::android::ScopedJavaLocalRef; |
11 | 12 |
12 namespace device { | 13 namespace device { |
13 | 14 |
14 // static | 15 // static |
15 bool UsbInterfaceAndroid::RegisterJNI(JNIEnv* env) { | 16 bool UsbInterfaceAndroid::RegisterJNI(JNIEnv* env) { |
16 return RegisterNativesImpl(env); // Generated in ChromeUsbInterface_jni.h | 17 return RegisterNativesImpl(env); // Generated in ChromeUsbInterface_jni.h |
17 } | 18 } |
18 | 19 |
19 // static | 20 // static |
20 UsbInterfaceDescriptor UsbInterfaceAndroid::Convert( | 21 UsbInterfaceDescriptor UsbInterfaceAndroid::Convert( |
21 JNIEnv* env, | 22 JNIEnv* env, |
22 const base::android::JavaRef<jobject>& usb_interface) { | 23 const base::android::JavaRef<jobject>& usb_interface) { |
23 ScopedJavaLocalRef<jobject> wrapper = | 24 ScopedJavaLocalRef<jobject> wrapper = |
24 Java_ChromeUsbInterface_create(env, usb_interface.obj()); | 25 Java_ChromeUsbInterface_create(env, usb_interface.obj()); |
25 | 26 |
| 27 uint8_t alternate_setting = 0; |
| 28 if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) { |
| 29 alternate_setting = |
| 30 Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj()); |
| 31 } |
| 32 |
26 UsbInterfaceDescriptor interface( | 33 UsbInterfaceDescriptor interface( |
27 Java_ChromeUsbInterface_getInterfaceNumber(env, wrapper.obj()), | 34 Java_ChromeUsbInterface_getInterfaceNumber(env, wrapper.obj()), |
28 Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj()), | 35 alternate_setting, |
29 Java_ChromeUsbInterface_getInterfaceClass(env, wrapper.obj()), | 36 Java_ChromeUsbInterface_getInterfaceClass(env, wrapper.obj()), |
30 Java_ChromeUsbInterface_getInterfaceSubclass(env, wrapper.obj()), | 37 Java_ChromeUsbInterface_getInterfaceSubclass(env, wrapper.obj()), |
31 Java_ChromeUsbInterface_getInterfaceProtocol(env, wrapper.obj())); | 38 Java_ChromeUsbInterface_getInterfaceProtocol(env, wrapper.obj())); |
32 | 39 |
33 ScopedJavaLocalRef<jobjectArray> endpoints = | 40 ScopedJavaLocalRef<jobjectArray> endpoints = |
34 Java_ChromeUsbInterface_getEndpoints(env, wrapper.obj()); | 41 Java_ChromeUsbInterface_getEndpoints(env, wrapper.obj()); |
35 jsize count = env->GetArrayLength(endpoints.obj()); | 42 jsize count = env->GetArrayLength(endpoints.obj()); |
36 interface.endpoints.reserve(count); | 43 interface.endpoints.reserve(count); |
37 for (jsize i = 0; i < count; ++i) { | 44 for (jsize i = 0; i < count; ++i) { |
38 ScopedJavaLocalRef<jobject> endpoint( | 45 ScopedJavaLocalRef<jobject> endpoint( |
39 env, env->GetObjectArrayElement(endpoints.obj(), i)); | 46 env, env->GetObjectArrayElement(endpoints.obj(), i)); |
40 interface.endpoints.push_back(UsbEndpointAndroid::Convert(env, endpoint)); | 47 interface.endpoints.push_back(UsbEndpointAndroid::Convert(env, endpoint)); |
41 } | 48 } |
42 | 49 |
43 return interface; | 50 return interface; |
44 } | 51 } |
45 | 52 |
46 } // namespace device | 53 } // namespace device |
OLD | NEW |