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

Commit ccc9d14d authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Use JNI helper function to get buffer address"

parents 108c7c51 90f4c18a

core/jni/android/graphics/Graphics.cpp

+4 −2
Original line number Diff line number Diff line
@@ -502,6 +502,8 @@ void AndroidPixelRef::globalUnref() { 


///////////////////////////////////////////////////////////////////////////////



extern "C" jbyte* jniGetNonMovableArrayElements(C_JNIEnv* env, jarray arrayObj);



jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,

                                             SkColorTable* ctable) {

    Sk64 size64 = bitmap->getSize64();
@@ -514,8 +516,8 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap, 
    size_t size = size64.get32();

    jbyteArray arrayObj = env->NewByteArray(size);

    if (arrayObj) {

        jbyte *addr = env->GetByteArrayElements(arrayObj, NULL);

        env->ReleaseByteArrayElements(arrayObj, addr, 0);

        // TODO: make this work without jniGetNonMovableArrayElements

        jbyte* addr = jniGetNonMovableArrayElements(&env->functions, arrayObj);

        if (addr) {

            SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable);

            bitmap->setPixelRef(pr)->unref();