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

Commit 0fb15d86 authored by Ashish Kumar Gupta's avatar Ashish Kumar Gupta Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3056082



Change-Id: I573a73eadd991fce82c14c9b0ea13be6cbcaec78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1492cdf 2d68f0a2

core/jni/android_hardware_UsbDeviceConnection.cpp

+14 −7
Original line number Diff line number Diff line
@@ -190,18 +190,25 @@ 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;

    std::unique_ptr<jbyte[]> bufferBytes(new (std::nothrow) jbyte[length]);

    if (!bufferBytes) {

        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);

        return -1;

    }



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

    if (!is_dir_in && buffer) {

        env->GetByteArrayRegion(buffer, start, length, bufferBytes.get());

    }



    if (bufferBytes) {

        env->ReleasePrimitiveArrayCritical(buffer, bufferBytes, 0);

    jint bytes_transferred =

            usb_device_bulk_transfer(device, endpoint, bufferBytes.get(), length, timeout);



    if (bytes_transferred > 0 && is_dir_in) {

        env->SetByteArrayRegion(buffer, start, bytes_transferred, bufferBytes.get());

    }



    return result;

    return bytes_transferred;

}



static jobject