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

Commit 0eeb68fe authored by Mark White's avatar Mark White Committed by Android (Google) Code Review
Browse files

Merge "usb: Use Get/SetByteArrayRegion in bulkTransfer" into main

parents b69c64db 00867227
Loading
Loading
Loading
Loading
+10 −6
Original line number Diff line number Diff line
@@ -190,17 +190,21 @@ android_hardware_UsbDeviceConnection_bulk_request(JNIEnv *env, jobject thiz,
        return -1;
    }

    jbyte* bufferBytes = NULL;
    if (buffer) {
        bufferBytes = (jbyte*)env->GetPrimitiveArrayCritical(buffer, NULL);
    bool is_dir_in = (endpoint & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN;
    jbyte *bufferBytes = (jbyte *)malloc(length);

    if (!is_dir_in && buffer) {
        env->GetByteArrayRegion(buffer, start, length, bufferBytes);
    }

    jint result = usb_device_bulk_transfer(device, endpoint, bufferBytes + start, length, timeout);
    jint result = usb_device_bulk_transfer(device, endpoint, bufferBytes, length, timeout);

    if (bufferBytes) {
        env->ReleasePrimitiveArrayCritical(buffer, bufferBytes, 0);
    if (is_dir_in && buffer) {
        env->SetByteArrayRegion(buffer, start, length, bufferBytes);
    }

    free(bufferBytes);

    return result;
}