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

Unified Diff: device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java

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, 7 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
Index: device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
diff --git a/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java b/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
index 834ddb189764ae726e0d98329b6a9de81fe006a6..beeec94e38a9a07a262ae3827a24721fbffbf439 100644
--- a/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
+++ b/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
@@ -4,7 +4,10 @@
package org.chromium.device.usb;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbManager;
@@ -25,15 +28,19 @@ final class ChromeUsbService {
private static final String TAG = "Usb";
Context mContext;
+ long mUsbServiceAndroid;
+ BroadcastReceiver mUsbDeviceReceiver;
- private ChromeUsbService(Context context) {
+ private ChromeUsbService(Context context, long usbServiceAndroid) {
mContext = context;
+ mUsbServiceAndroid = usbServiceAndroid;
+ registerForUsbDeviceIntentBroadcast();
Log.v(TAG, "ChromeUsbService created.");
}
@CalledByNative
- private static ChromeUsbService create(Context context) {
- return new ChromeUsbService(context);
+ private static ChromeUsbService create(Context context, long usbServiceAndroid) {
+ return new ChromeUsbService(context, usbServiceAndroid);
}
@CalledByNative
@@ -42,4 +49,37 @@ final class ChromeUsbService {
HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
return deviceList.values().toArray();
}
+
+ @CalledByNative
+ private void close() {
+ unregisterForUsbDeviceIntentBroadcast();
+ }
+
+ private native void nativeDeviceAttached(long nativeUsbServiceAndroid, UsbDevice device);
+
+ private native void nativeDeviceDetached(long nativeUsbServiceAndroid, int deviceId);
+
+ private void registerForUsbDeviceIntentBroadcast() {
+ mUsbDeviceReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+ if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(intent.getAction())) {
+ nativeDeviceAttached(mUsbServiceAndroid, device);
+ } else if (UsbManager.ACTION_USB_DEVICE_DETACHED.equals(intent.getAction())) {
+ nativeDeviceDetached(mUsbServiceAndroid, device.getDeviceId());
+ }
+ }
+ };
+
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+ filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+ mContext.registerReceiver(mUsbDeviceReceiver, filter);
+ }
+
+ private void unregisterForUsbDeviceIntentBroadcast() {
+ mContext.unregisterReceiver(mUsbDeviceReceiver);
+ mUsbDeviceReceiver = null;
+ }
}
« no previous file with comments | « device/usb/android/java/src/org/chromium/device/usb/ChromeUsbDevice.java ('k') | device/usb/usb_device_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698