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

Commit b57dd722 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for a884d81e to stage-aosp-master 

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
parents aa311698 a884d81e

core/jni/AndroidRuntime.cpp

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

/*

 * JNI registration.

 * JNI registration.

 */

 */

static JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {

    { "nativeFinishInit", "()V",

    { "nativeFinishInit", "()V",

        (void*) com_android_internal_os_RuntimeInit_nativeFinishInit },

        (void*) com_android_internal_os_RuntimeInit_nativeFinishInit },

    { "nativeZygoteInit", "()V",

    { "nativeZygoteInit", "()V",

core/jni/android/graphics/Bitmap.cpp

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




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

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





static JNINativeMethod gBitmapMethods[] = {

static const JNINativeMethod gBitmapMethods[] = {

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

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

        (void*)Bitmap_creator },

        (void*)Bitmap_creator },

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

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

core/jni/android/graphics/BitmapFactory.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -542,7 +542,7 @@ jobject decodeBitmap(JNIEnv* env, void* data, size_t size) { 




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

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





static JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {

    {   "nativeDecodeStream",

    {   "nativeDecodeStream",

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

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

        (void*)nativeDecodeStream

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

    },

};

};





static JNINativeMethod gOptionsMethods[] = {

static const JNINativeMethod gOptionsMethods[] = {

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

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

};

};

core/jni/android/graphics/BitmapRegionDecoder.cpp

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




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

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





static JNINativeMethod gBitmapRegionDecoderMethods[] = {

static const JNINativeMethod gBitmapRegionDecoderMethods[] = {

    {   "nativeDecodeRegion",

    {   "nativeDecodeRegion",

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

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

        (void*)nativeDecodeRegion},

        (void*)nativeDecodeRegion},

core/jni/android/graphics/Camera.cpp

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

/*

 * JNI registration.

 * JNI registration.

 */

 */

static JNINativeMethod gCameraMethods[] = {

static const JNINativeMethod gCameraMethods[] = {

    /* name, signature, funcPtr */

    /* name, signature, funcPtr */





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

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