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

Commit 385a4894 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 4ff42ad6: Merge change 2843 into donut 

Merge commit '4ff42ad6'

* commit '4ff42ad6':
  Use JNI region calls in MemoryFile read and write.
parents cf2924ef 4ff42ad6

core/jni/android_os_MemoryFile.cpp

+2 −6
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ static jint android_os_MemoryFile_read(JNIEnv* env, jobject clazz, 
        return -1;

    }



    jbyte* bytes = env->GetByteArrayElements(buffer, 0);

    memcpy(bytes + destOffset, (const char *)address + srcOffset, count);

    env->ReleaseByteArrayElements(buffer, bytes, 0);

    env->SetByteArrayRegion(buffer, destOffset, count, (const jbyte *)address + srcOffset);



    if (unpinned) {

        ashmem_unpin_region(fd, 0, 0);
@@ -103,9 +101,7 @@ static jint android_os_MemoryFile_write(JNIEnv* env, jobject clazz, 
        return -1;

    }



    jbyte* bytes = env->GetByteArrayElements(buffer, 0);

    memcpy((char *)address + destOffset, bytes + srcOffset, count);

    env->ReleaseByteArrayElements(buffer, bytes, 0);

    env->GetByteArrayRegion(buffer, srcOffset, count, (jbyte *)address + destOffset);



    if (unpinned) {

        ashmem_unpin_region(fd, 0, 0);