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

Commit a27ad3cc authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Correctly register native methods."

parents 37701dcf 035f1010

core/jni/android_view_GLES20Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static JNINativeMethod gMethods[] = { 
    { "nCreateLayer",            "(IIZ[I)I",   (void*) android_view_GLES20Canvas_createLayer },

    { "nResizeLayer",            "(III[I)V" ,  (void*) android_view_GLES20Canvas_resizeLayer },

    { "nCreateTextureLayer",     "([I)I",      (void*) android_view_GLES20Canvas_createTextureLayer },

    { "nUpdateTextureLayer",     "(IIILjava/lang/String;)V",

    { "nUpdateTextureLayer",     "(IIILandroid/graphics/SurfaceTexture;)V",

                                               (void*) android_view_GLES20Canvas_updateTextureLayer },

    { "nDestroyLayer",           "(I)V",       (void*) android_view_GLES20Canvas_destroyLayer },

    { "nDestroyLayerDeferred",   "(I)V",       (void*) android_view_GLES20Canvas_destroyLayerDeferred },

core/jni/android_view_TextureView.cpp

+6 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/android_graphics_SurfaceTexture.h>



#include <gui/SurfaceTexture.h>
@@ -27,10 +28,10 @@ namespace android { 
// ----------------------------------------------------------------------------



static void android_view_TextureView_setDefaultBufferSize(JNIEnv* env, jobject,

    jint surfaceTexture, jint width, jint height) {

    jobject surface, jint width, jint height) {



    sp<SurfaceTexture> surface = reinterpret_cast<SurfaceTexture*>(surfaceTexture);

    surface->setDefaultBufferSize(width, height);

    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, surface));

    surfaceTexture->setDefaultBufferSize(width, height);

}



// ----------------------------------------------------------------------------
@@ -40,7 +41,8 @@ static void android_view_TextureView_setDefaultBufferSize(JNIEnv* env, jobject, 
const char* const kClassPathName = "android/view/TextureView";



static JNINativeMethod gMethods[] = {

    {   "nSetDefaultBufferSize", "(III)V", (void*) android_view_TextureView_setDefaultBufferSize }

    {   "nSetDefaultBufferSize", "(Landroid/graphics/SurfaceTexture;II)V",

            (void*) android_view_TextureView_setDefaultBufferSize }

};



int register_android_view_TextureView(JNIEnv* env) {