diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-09-19 02:00:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 02:00:26 +0000 |
| commit | 51938c205f41da95486b17ea645fd0ce2a73be82 (patch) | |
| tree | 80b23ecf19607c803605a5f9fa173e11a9a9a744 /services/core/jni | |
| parent | 3540c462d95a0720e2931c30e1fe9820d0d63c51 (diff) | |
| parent | 9ee5e7e17f7d65620f21d1a42865981e7bc56593 (diff) | |
| download | frameworks_base-51938c205f41da95486b17ea645fd0ce2a73be82.zip frameworks_base-51938c205f41da95486b17ea645fd0ce2a73be82.tar.gz frameworks_base-51938c205f41da95486b17ea645fd0ce2a73be82.tar.bz2 | |
Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
Diffstat (limited to 'services/core/jni')
| -rw-r--r-- | services/core/jni/com_android_server_UsbHostManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/core/jni/com_android_server_UsbHostManager.cpp b/services/core/jni/com_android_server_UsbHostManager.cpp index 65a28c0..32c3f95 100644 --- a/services/core/jni/com_android_server_UsbHostManager.cpp +++ b/services/core/jni/com_android_server_UsbHostManager.cpp @@ -74,9 +74,9 @@ static int usb_device_added(const char *devname, void* client_data) { char *serial = usb_device_get_serial(device); jstring deviceName = env->NewStringUTF(devname); - jstring manufacturerName = env->NewStringUTF(manufacturer); - jstring productName = env->NewStringUTF(product); - jstring serialNumber = env->NewStringUTF(serial); + jstring manufacturerName = AndroidRuntime::NewStringLatin1(env, manufacturer); + jstring productName = AndroidRuntime::NewStringLatin1(env, product); + jstring serialNumber = AndroidRuntime::NewStringLatin1(env, serial); jboolean result = env->CallBooleanMethod(thiz, method_beginUsbDeviceAdded, deviceName, usb_device_get_vendor_id(device), usb_device_get_product_id(device), @@ -99,7 +99,7 @@ static int usb_device_added(const char *devname, void* client_data) { if (desc->bDescriptorType == USB_DT_CONFIG) { struct usb_config_descriptor *config = (struct usb_config_descriptor *)desc; char *name = usb_device_get_string(device, config->iConfiguration); - jstring configName = env->NewStringUTF(name); + jstring configName = AndroidRuntime::NewStringLatin1(env, name); env->CallVoidMethod(thiz, method_addUsbConfiguration, config->bConfigurationValue, configName, config->bmAttributes, @@ -110,7 +110,7 @@ static int usb_device_added(const char *devname, void* client_data) { } else if (desc->bDescriptorType == USB_DT_INTERFACE) { struct usb_interface_descriptor *interface = (struct usb_interface_descriptor *)desc; char *name = usb_device_get_string(device, interface->iInterface); - jstring interfaceName = env->NewStringUTF(name); + jstring interfaceName = AndroidRuntime::NewStringLatin1(env, name); env->CallVoidMethod(thiz, method_addUsbInterface, interface->bInterfaceNumber, interfaceName, interface->bAlternateSetting, |