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

Side by Side Diff: device/usb/usb_service_android.cc

Issue 2017273002: Support USB device hotplug on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add dependency on //device/usb:java. 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 unified diff | Download patch
« no previous file with comments | « device/usb/usb_service_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" 10 #include "base/android/context_utils.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "components/device_event_log/device_event_log.h"
14 #include "device/usb/usb_device_android.h" 15 #include "device/usb/usb_device_android.h"
15 #include "jni/ChromeUsbService_jni.h" 16 #include "jni/ChromeUsbService_jni.h"
16 17
17 using base::android::AttachCurrentThread; 18 using base::android::AttachCurrentThread;
19 using base::android::JavaRef;
18 using base::android::ScopedJavaLocalRef; 20 using base::android::ScopedJavaLocalRef;
19 21
20 namespace device { 22 namespace device {
21 23
22 // static 24 // static
23 bool UsbServiceAndroid::RegisterJNI(JNIEnv* env) { 25 bool UsbServiceAndroid::RegisterJNI(JNIEnv* env) {
24 return RegisterNativesImpl(env); // Generated in ChromeUsbService_jni.h 26 return RegisterNativesImpl(env); // Generated in ChromeUsbService_jni.h
25 } 27 }
26 28
27 UsbServiceAndroid::UsbServiceAndroid() { 29 UsbServiceAndroid::UsbServiceAndroid() {
28 j_object_.Reset(Java_ChromeUsbService_create( 30 JNIEnv* env = AttachCurrentThread();
29 AttachCurrentThread(), base::android::GetApplicationContext())); 31 j_object_.Reset(
32 Java_ChromeUsbService_create(env, base::android::GetApplicationContext(),
33 reinterpret_cast<jlong>(this)));
34 ScopedJavaLocalRef<jobjectArray> devices =
35 Java_ChromeUsbService_getDevices(env, j_object_.obj());
36 jsize length = env->GetArrayLength(devices.obj());
37 for (jsize i = 0; i < length; ++i) {
38 ScopedJavaLocalRef<jobject> usb_device(
39 env, env->GetObjectArrayElement(devices.obj(), i));
40 scoped_refptr<UsbDeviceAndroid> device(
41 UsbDeviceAndroid::Create(env, usb_device));
42 AddDevice(device);
43 }
30 } 44 }
31 45
32 UsbServiceAndroid::~UsbServiceAndroid() {} 46 UsbServiceAndroid::~UsbServiceAndroid() {
47 JNIEnv* env = AttachCurrentThread();
48 Java_ChromeUsbService_close(env, j_object_.obj());
49 }
33 50
34 scoped_refptr<UsbDevice> UsbServiceAndroid::GetDevice(const std::string& guid) { 51 scoped_refptr<UsbDevice> UsbServiceAndroid::GetDevice(const std::string& guid) {
35 return nullptr; 52 auto it = devices_by_guid_.find(guid);
53 if (it == devices_by_guid_.end())
54 return nullptr;
55 return it->second;
36 } 56 }
37 57
38 void UsbServiceAndroid::GetDevices(const GetDevicesCallback& callback) { 58 void UsbServiceAndroid::GetDevices(const GetDevicesCallback& callback) {
39 JNIEnv* env = AttachCurrentThread(); 59 std::vector<scoped_refptr<UsbDevice>> devices;
40 ScopedJavaLocalRef<jobjectArray> devices = 60 devices.reserve(devices_by_guid_.size());
41 Java_ChromeUsbService_getDevices(env, j_object_.obj()); 61 for (const auto& map_entry : devices_by_guid_)
42 jsize length = env->GetArrayLength(devices.obj()); 62 devices.push_back(map_entry.second);
63 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
64 base::Bind(callback, devices));
65 }
43 66
44 std::vector<scoped_refptr<UsbDevice>> results; 67 void UsbServiceAndroid::DeviceAttached(JNIEnv* env,
45 for (jsize i = 0; i < length; ++i) { 68 const JavaRef<jobject>& caller,
46 ScopedJavaLocalRef<jobject> raw_device( 69 const JavaRef<jobject>& usb_device) {
47 env, env->GetObjectArrayElement(devices.obj(), i)); 70 scoped_refptr<UsbDeviceAndroid> device(
48 results.push_back(UsbDeviceAndroid::Create(env, raw_device)); 71 UsbDeviceAndroid::Create(env, usb_device));
49 } 72 AddDevice(device);
73 NotifyDeviceAdded(device);
74 }
50 75
51 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, 76 void UsbServiceAndroid::DeviceDetached(JNIEnv* env,
52 base::Bind(callback, results)); 77 const JavaRef<jobject>& caller,
78 jint device_id) {
79 auto it = devices_by_id_.find(device_id);
80 if (it == devices_by_id_.end())
81 return;
82
83 scoped_refptr<UsbDeviceAndroid> device = it->second;
84 devices_by_id_.erase(it);
85 devices_by_guid_.erase(device->guid());
86
87 USB_LOG(USER) << "USB device removed: id=" << device->device_id()
88 << " guid=" << device->guid();
89
90 NotifyDeviceRemoved(device);
91 }
92
93 void UsbServiceAndroid::AddDevice(scoped_refptr<UsbDeviceAndroid> device) {
94 DCHECK(!ContainsKey(devices_by_id_, device->device_id()));
95 DCHECK(!ContainsKey(devices_by_guid_, device->guid()));
96 devices_by_id_[device->device_id()] = device;
97 devices_by_guid_[device->guid()] = device;
98
99 USB_LOG(USER) << "USB device added: id=" << device->device_id()
100 << " vendor=" << device->vendor_id() << " \""
101 << device->manufacturer_string()
102 << "\", product=" << device->product_id() << " \""
103 << device->product_string() << "\", serial=\""
104 << device->serial_number() << "\", guid=" << device->guid();
53 } 105 }
54 106
55 } // namespace device 107 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_service_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698