| 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_service_android.h" | 5 #include "device/usb/usb_service_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/android/context_utils.h" | |
| 11 #include "base/bind.h" | 10 #include "base/bind.h" |
| 12 #include "base/location.h" | 11 #include "base/location.h" |
| 13 #include "base/sequenced_task_runner.h" | 12 #include "base/sequenced_task_runner.h" |
| 14 #include "components/device_event_log/device_event_log.h" | 13 #include "components/device_event_log/device_event_log.h" |
| 15 #include "device/usb/usb_device_android.h" | 14 #include "device/usb/usb_device_android.h" |
| 16 #include "jni/ChromeUsbService_jni.h" | 15 #include "jni/ChromeUsbService_jni.h" |
| 17 | 16 |
| 18 using base::android::AttachCurrentThread; | 17 using base::android::AttachCurrentThread; |
| 19 using base::android::JavaRef; | 18 using base::android::JavaRef; |
| 20 using base::android::ScopedJavaLocalRef; | 19 using base::android::ScopedJavaLocalRef; |
| 21 | 20 |
| 22 namespace device { | 21 namespace device { |
| 23 | 22 |
| 24 // static | 23 // static |
| 25 bool UsbServiceAndroid::RegisterJNI(JNIEnv* env) { | 24 bool UsbServiceAndroid::RegisterJNI(JNIEnv* env) { |
| 26 return RegisterNativesImpl(env); // Generated in ChromeUsbService_jni.h | 25 return RegisterNativesImpl(env); // Generated in ChromeUsbService_jni.h |
| 27 } | 26 } |
| 28 | 27 |
| 29 UsbServiceAndroid::UsbServiceAndroid() | 28 UsbServiceAndroid::UsbServiceAndroid() |
| 30 : UsbService(nullptr), weak_factory_(this) { | 29 : UsbService(nullptr), weak_factory_(this) { |
| 31 JNIEnv* env = AttachCurrentThread(); | 30 JNIEnv* env = AttachCurrentThread(); |
| 32 j_object_.Reset( | 31 j_object_.Reset( |
| 33 Java_ChromeUsbService_create(env, base::android::GetApplicationContext(), | 32 Java_ChromeUsbService_create(env, reinterpret_cast<jlong>(this))); |
| 34 reinterpret_cast<jlong>(this))); | |
| 35 ScopedJavaLocalRef<jobjectArray> devices = | 33 ScopedJavaLocalRef<jobjectArray> devices = |
| 36 Java_ChromeUsbService_getDevices(env, j_object_); | 34 Java_ChromeUsbService_getDevices(env, j_object_); |
| 37 jsize length = env->GetArrayLength(devices.obj()); | 35 jsize length = env->GetArrayLength(devices.obj()); |
| 38 for (jsize i = 0; i < length; ++i) { | 36 for (jsize i = 0; i < length; ++i) { |
| 39 ScopedJavaLocalRef<jobject> usb_device( | 37 ScopedJavaLocalRef<jobject> usb_device( |
| 40 env, env->GetObjectArrayElement(devices.obj(), i)); | 38 env, env->GetObjectArrayElement(devices.obj(), i)); |
| 41 scoped_refptr<UsbDeviceAndroid> device = | 39 scoped_refptr<UsbDeviceAndroid> device = |
| 42 UsbDeviceAndroid::Create(env, weak_factory_.GetWeakPtr(), usb_device); | 40 UsbDeviceAndroid::Create(env, weak_factory_.GetWeakPtr(), usb_device); |
| 43 AddDevice(device); | 41 AddDevice(device); |
| 44 } | 42 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 104 |
| 107 USB_LOG(USER) << "USB device added: id=" << device->device_id() | 105 USB_LOG(USER) << "USB device added: id=" << device->device_id() |
| 108 << " vendor=" << device->vendor_id() << " \"" | 106 << " vendor=" << device->vendor_id() << " \"" |
| 109 << device->manufacturer_string() | 107 << device->manufacturer_string() |
| 110 << "\", product=" << device->product_id() << " \"" | 108 << "\", product=" << device->product_id() << " \"" |
| 111 << device->product_string() << "\", serial=\"" | 109 << device->product_string() << "\", serial=\"" |
| 112 << device->serial_number() << "\", guid=" << device->guid(); | 110 << device->serial_number() << "\", guid=" << device->guid(); |
| 113 } | 111 } |
| 114 | 112 |
| 115 } // namespace device | 113 } // namespace device |
| OLD | NEW |