Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7661dd8d authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

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

parents 2edbdcc6 8f8c6023

services/jni/com_android_server_UsbService.cpp

+8 −1
Original line number Original line Diff line number Diff line
@@ -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;

}

}