commit 7661dd8de10d2400cedc421358c4261556b2b5c8
author Mike Lockwood <lockwood@android.com> Mon Mar 28 10:58:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 28 10:58:03 2011 -0700
tree 4e8c9e25c4a48412c3f63b6de1f5b125667f6f36
parent 2edbdcc6f2572e5f84253617b1850908344b3f8c
parent 8f8c6023f2fad38347cd19af9a81fa485fe3bd82

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

services/jni/com_android_server_UsbService.cpp

diff --git a/services/jni/com_android_server_UsbService.cpp b/services/jni/com_android_server_UsbService.cpp
index 816f76f..6aeede2 100644
--- a/services/jni/com_android_server_UsbService.cpp
+++ b/services/jni/com_android_server_UsbService.cpp
@@ -117,9 +117,14 @@
     jintArray endpointArray = env->NewIntArray(length);
     env->SetIntArrayRegion(endpointArray, 0, length, endpointValues.array());
 
+    jstring deviceName = env->NewStringUTF(devname);
     env->CallVoidMethod(thiz, method_usbDeviceAdded,
-            env->NewStringUTF(devname), vendorId, productId, deviceClass,
+            deviceName, vendorId, productId, deviceClass,
             deviceSubClass, protocol, interfaceArray, endpointArray);
+
+    env->DeleteLocalRef(interfaceArray);
+    env->DeleteLocalRef(endpointArray);
+    env->DeleteLocalRef(deviceName);
     checkAndClearExceptionFromCallback(env, __FUNCTION__);
 
     return 0;
@@ -129,7 +134,9 @@
     JNIEnv* env = AndroidRuntime::getJNIEnv();
     jobject thiz = (jobject)client_data;
 
+    jstring deviceName = env->NewStringUTF(devname);
     env->CallVoidMethod(thiz, method_usbDeviceRemoved, env->NewStringUTF(devname));
+    env->DeleteLocalRef(deviceName);
     checkAndClearExceptionFromCallback(env, __FUNCTION__);
     return 0;
 }