Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1

Browse Source
This commit is contained in:
Mike Lockwood
2011-03-28 10:58:03 -07:00
committed by Android (Google) Code Review
parent 2edbdcc6f2 8f8c6023f2
commit 7661dd8de1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/jni/com_android_server_UsbService.cpp
View File

@@ -117,9 +117,14 @@ static int usb_device_added(const char *devname, void* client_data) {
jintArray endpointArray = env->NewIntArray(length); jintArray endpointArray = env->NewIntArray(length);
env->SetIntArrayRegion(endpointArray, 0, length, endpointValues.array()); env->SetIntArrayRegion(endpointArray, 0, length, endpointValues.array());
jstring deviceName = env->NewStringUTF(devname);
env->CallVoidMethod(thiz, method_usbDeviceAdded, env->CallVoidMethod(thiz, method_usbDeviceAdded,
env->NewStringUTF(devname), vendorId, productId, deviceClass, deviceName, vendorId, productId, deviceClass,
deviceSubClass, protocol, interfaceArray, endpointArray); deviceSubClass, protocol, interfaceArray, endpointArray);
env->DeleteLocalRef(interfaceArray);
env->DeleteLocalRef(endpointArray);
env->DeleteLocalRef(deviceName);
checkAndClearExceptionFromCallback(env, __FUNCTION__); checkAndClearExceptionFromCallback(env, __FUNCTION__);
return 0; return 0;
@@ -129,7 +134,9 @@ static int usb_device_removed(const char *devname, void* client_data) {
JNIEnv* env = AndroidRuntime::getJNIEnv(); JNIEnv* env = AndroidRuntime::getJNIEnv();
jobject thiz = (jobject)client_data; jobject thiz = (jobject)client_data;
jstring deviceName = env->NewStringUTF(devname);
env->CallVoidMethod(thiz, method_usbDeviceRemoved, env->NewStringUTF(devname)); env->CallVoidMethod(thiz, method_usbDeviceRemoved, env->NewStringUTF(devname));
env->DeleteLocalRef(deviceName);
checkAndClearExceptionFromCallback(env, __FUNCTION__); checkAndClearExceptionFromCallback(env, __FUNCTION__);
return 0; return 0;
} }