diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-04-29 13:05:55 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2015-04-29 13:05:55 -0700 |
| commit | c9bb40ea95101f8a46fab29beac02cc7204be320 (patch) | |
| tree | 5aef354e455b83e8535eea75bbb8889f3d685bb5 /services/core | |
| parent | 2333912c6e4d51995a3fd01286c21c4d0328eb1a (diff) | |
| download | frameworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.zip frameworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.tar.gz frameworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.tar.bz2 | |
UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/jni/com_android_server_UsbHostManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/jni/com_android_server_UsbHostManager.cpp b/services/core/jni/com_android_server_UsbHostManager.cpp index ee50ff9..d8c172f 100644 --- a/services/core/jni/com_android_server_UsbHostManager.cpp +++ b/services/core/jni/com_android_server_UsbHostManager.cpp @@ -71,6 +71,7 @@ static int usb_device_added(const char *devname, void* client_data) { char *manufacturer = usb_device_get_manufacturer_name(device); char *product = usb_device_get_product_name(device); + int version = usb_device_get_version(device); char *serial = usb_device_get_serial(device); jstring deviceName = env->NewStringUTF(devname); @@ -81,7 +82,7 @@ static int usb_device_added(const char *devname, void* client_data) { jboolean result = env->CallBooleanMethod(thiz, method_beginUsbDeviceAdded, deviceName, usb_device_get_vendor_id(device), usb_device_get_product_id(device), deviceDesc->bDeviceClass, deviceDesc->bDeviceSubClass, deviceDesc->bDeviceProtocol, - manufacturerName, productName, serialNumber); + manufacturerName, productName, version, serialNumber); env->DeleteLocalRef(serialNumber); env->DeleteLocalRef(productName); @@ -199,7 +200,7 @@ int register_android_server_UsbHostManager(JNIEnv *env) return -1; } method_beginUsbDeviceAdded = env->GetMethodID(clazz, "beginUsbDeviceAdded", - "(Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z"); + "(Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z"); if (method_beginUsbDeviceAdded == NULL) { ALOGE("Can't find beginUsbDeviceAdded"); return -1; |