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

Commit a884d81e authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "constify JNINativeMethod function pointer tables"

parents 0361b18e 76f6a86d

core/jni/AndroidRuntime.cpp

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void com_android_internal_os_RuntimeInit_nativeSetExitWithoutCleanup(JNIE 
/*

 * JNI registration.

 */

static JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {

    { "nativeFinishInit", "()V",

        (void*) com_android_internal_os_RuntimeInit_nativeFinishInit },

    { "nativeZygoteInit", "()V",

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapHandle) { 


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



static JNINativeMethod gBitmapMethods[] = {

static const JNINativeMethod gBitmapMethods[] = {

    {   "nativeCreate",             "([IIIIIIZ)Landroid/graphics/Bitmap;",

        (void*)Bitmap_creator },

    {   "nativeCopy",               "(JIZ)Landroid/graphics/Bitmap;",

core/jni/android/graphics/BitmapFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static jboolean nativeIsSeekable(JNIEnv* env, jobject, jobject fileDescriptor) { 


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



static JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {

    {   "nativeDecodeStream",

        "(Ljava/io/InputStream;[BLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;",

        (void*)nativeDecodeStream
@@ -575,7 +575,7 @@ static JNINativeMethod gMethods[] = { 
    },

};



static JNINativeMethod gOptionsMethods[] = {

static const JNINativeMethod gOptionsMethods[] = {

    {   "requestCancel", "()V", (void*)nativeRequestCancel }

};

core/jni/android/graphics/BitmapRegionDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void nativeClean(JNIEnv* env, jobject, jlong brdHandle) { 


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



static JNINativeMethod gBitmapRegionDecoderMethods[] = {

static const JNINativeMethod gBitmapRegionDecoderMethods[] = {

    {   "nativeDecodeRegion",

        "(JIIIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;",

        (void*)nativeDecodeRegion},

core/jni/android/graphics/Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj, 
/*

 * JNI registration.

 */

static JNINativeMethod gCameraMethods[] = {

static const JNINativeMethod gCameraMethods[] = {

    /* name, signature, funcPtr */



    { "nativeConstructor",   "()V",    (void*)Camera_constructor   },