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

Commit 3fc5e3ca authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am 2c596a53: Merge "Frameworks/base: Consistency in core/jni" 

* commit '2c596a53':
  Frameworks/base: Consistency in core/jni
parents 09910723 2c596a53

core/jni/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -265,6 +265,10 @@ LOCAL_MODULE:= libandroid_runtime 
#                       off a GCC warning that Clang doesn't know.

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unknown-pragmas



# -Wno-c++11-extensions: Clang warns about Skia using the C++11 override keyword, but this project

#                        is not being compiled with that level. Remove once this has changed.

LOCAL_CFLAGS += -Wno-c++11-extensions



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

core/jni/android/graphics/AutoDecodeCancel.h

+3 −3
Original line number Diff line number Diff line 
#ifndef AutoDecodeCancel_DEFINED

#define AutoDecodeCancel_DEFINED

#ifndef _ANDROID_GRAPHICS_AUTO_DECODE_CANCEL_H_

#define _ANDROID_GRAPHICS_AUTO_DECODE_CANCEL_H_



#include <jni.h>

#include "SkImageDecoder.h"
@@ -24,4 +24,4 @@ private: 
#endif

};



#endif
 
#endif  // _ANDROID_GRAPHICS_AUTO_DECODE_CANCEL_H_

core/jni/android/graphics/Bitmap.cpp

+4 −12
Original line number Diff line number Diff line
@@ -15,16 +15,12 @@ 
#include "android_nio_utils.h"

#include "CreateJavaOutputStreamAdaptor.h"



#include "core_jni_helpers.h"



#include <jni.h>



#include <Caches.h>



#if 0

    #define TRACE_BITMAP(code)  code

#else

    #define TRACE_BITMAP(code)

#endif



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

// Conversions to/from SkColor, for get/setPixels, and the create method, which

// is basically like setPixels
@@ -876,8 +872,6 @@ static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapHandle) { 


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



#include <android_runtime/AndroidRuntime.h>



static JNINativeMethod gBitmapMethods[] = {

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

        (void*)Bitmap_creator },
@@ -917,10 +911,8 @@ static JNINativeMethod gBitmapMethods[] = { 
    {   "nativePrepareToDraw",      "(J)V", (void*)Bitmap_prepareToDraw },

};



#define kClassPathName  "android/graphics/Bitmap"



int register_android_graphics_Bitmap(JNIEnv* env)

{

    return android::AndroidRuntime::registerNativeMethods(env, kClassPathName,

                                gBitmapMethods, SK_ARRAY_COUNT(gBitmapMethods));

    return android::RegisterMethodsOrDie(env, "android/graphics/Bitmap", gBitmapMethods,

                                         NELEM(gBitmapMethods));

}

core/jni/android/graphics/BitmapFactory.cpp

+30 −42
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "JNIHelp.h"

#include "GraphicsJNI.h"



#include <android_runtime/AndroidRuntime.h>

#include "core_jni_helpers.h"

#include <androidfw/Asset.h>

#include <androidfw/ResourceTypes.h>

#include <cutils/compiler.h>
@@ -573,52 +573,40 @@ static JNINativeMethod gOptionsMethods[] = { 
    {   "requestCancel", "()V", (void*)nativeRequestCancel }

};



static jfieldID getFieldIDCheck(JNIEnv* env, jclass clazz,

                                const char fieldname[], const char type[]) {

    jfieldID id = env->GetFieldID(clazz, fieldname, type);

    SkASSERT(id);

    return id;

}



int register_android_graphics_BitmapFactory(JNIEnv* env) {

    jclass options_class = env->FindClass("android/graphics/BitmapFactory$Options");

    SkASSERT(options_class);

    gOptions_bitmapFieldID = getFieldIDCheck(env, options_class, "inBitmap",

    jclass options_class = FindClassOrDie(env, "android/graphics/BitmapFactory$Options");

    gOptions_bitmapFieldID = GetFieldIDOrDie(env, options_class, "inBitmap",

            "Landroid/graphics/Bitmap;");

    gOptions_justBoundsFieldID = getFieldIDCheck(env, options_class, "inJustDecodeBounds", "Z");

    gOptions_sampleSizeFieldID = getFieldIDCheck(env, options_class, "inSampleSize", "I");

    gOptions_configFieldID = getFieldIDCheck(env, options_class, "inPreferredConfig",

    gOptions_justBoundsFieldID = GetFieldIDOrDie(env, options_class, "inJustDecodeBounds", "Z");

    gOptions_sampleSizeFieldID = GetFieldIDOrDie(env, options_class, "inSampleSize", "I");

    gOptions_configFieldID = GetFieldIDOrDie(env, options_class, "inPreferredConfig",

            "Landroid/graphics/Bitmap$Config;");

    gOptions_premultipliedFieldID = getFieldIDCheck(env, options_class, "inPremultiplied", "Z");

    gOptions_mutableFieldID = getFieldIDCheck(env, options_class, "inMutable", "Z");

    gOptions_ditherFieldID = getFieldIDCheck(env, options_class, "inDither", "Z");

    gOptions_preferQualityOverSpeedFieldID = getFieldIDCheck(env, options_class,

    gOptions_premultipliedFieldID = GetFieldIDOrDie(env, options_class, "inPremultiplied", "Z");

    gOptions_mutableFieldID = GetFieldIDOrDie(env, options_class, "inMutable", "Z");

    gOptions_ditherFieldID = GetFieldIDOrDie(env, options_class, "inDither", "Z");

    gOptions_preferQualityOverSpeedFieldID = GetFieldIDOrDie(env, options_class,

            "inPreferQualityOverSpeed", "Z");

    gOptions_scaledFieldID = getFieldIDCheck(env, options_class, "inScaled", "Z");

    gOptions_densityFieldID = getFieldIDCheck(env, options_class, "inDensity", "I");

    gOptions_screenDensityFieldID = getFieldIDCheck(env, options_class, "inScreenDensity", "I");

    gOptions_targetDensityFieldID = getFieldIDCheck(env, options_class, "inTargetDensity", "I");

    gOptions_widthFieldID = getFieldIDCheck(env, options_class, "outWidth", "I");

    gOptions_heightFieldID = getFieldIDCheck(env, options_class, "outHeight", "I");

    gOptions_mimeFieldID = getFieldIDCheck(env, options_class, "outMimeType", "Ljava/lang/String;");

    gOptions_mCancelID = getFieldIDCheck(env, options_class, "mCancel", "Z");



    jclass bitmap_class = env->FindClass("android/graphics/Bitmap");

    SkASSERT(bitmap_class);

    gBitmap_nativeBitmapFieldID = getFieldIDCheck(env, bitmap_class, "mNativeBitmap", "J");

    gBitmap_ninePatchInsetsFieldID = getFieldIDCheck(env, bitmap_class, "mNinePatchInsets",

    gOptions_scaledFieldID = GetFieldIDOrDie(env, options_class, "inScaled", "Z");

    gOptions_densityFieldID = GetFieldIDOrDie(env, options_class, "inDensity", "I");

    gOptions_screenDensityFieldID = GetFieldIDOrDie(env, options_class, "inScreenDensity", "I");

    gOptions_targetDensityFieldID = GetFieldIDOrDie(env, options_class, "inTargetDensity", "I");

    gOptions_widthFieldID = GetFieldIDOrDie(env, options_class, "outWidth", "I");

    gOptions_heightFieldID = GetFieldIDOrDie(env, options_class, "outHeight", "I");

    gOptions_mimeFieldID = GetFieldIDOrDie(env, options_class, "outMimeType", "Ljava/lang/String;");

    gOptions_mCancelID = GetFieldIDOrDie(env, options_class, "mCancel", "Z");



    jclass bitmap_class = FindClassOrDie(env, "android/graphics/Bitmap");

    gBitmap_nativeBitmapFieldID = GetFieldIDOrDie(env, bitmap_class, "mNativeBitmap", "J");

    gBitmap_ninePatchInsetsFieldID = GetFieldIDOrDie(env, bitmap_class, "mNinePatchInsets",

            "Landroid/graphics/NinePatch$InsetStruct;");



    gInsetStruct_class = (jclass) env->NewGlobalRef(env->FindClass("android/graphics/NinePatch$InsetStruct"));

    gInsetStruct_constructorMethodID = env->GetMethodID(gInsetStruct_class, "<init>", "(IIIIIIIIFIF)V");

    gInsetStruct_class = MakeGlobalRefOrDie(env, FindClassOrDie(env,

        "android/graphics/NinePatch$InsetStruct"));

    gInsetStruct_constructorMethodID = GetMethodIDOrDie(env, gInsetStruct_class, "<init>",

                                                        "(IIIIIIIIFIF)V");



    int ret = AndroidRuntime::registerNativeMethods(env,

                                    "android/graphics/BitmapFactory$Options",

                                    gOptionsMethods,

                                    SK_ARRAY_COUNT(gOptionsMethods));

    if (ret) {

        return ret;

    }

    return android::AndroidRuntime::registerNativeMethods(env, "android/graphics/BitmapFactory",

                                         gMethods, SK_ARRAY_COUNT(gMethods));

    android::RegisterMethodsOrDie(env, "android/graphics/BitmapFactory$Options",

                                  gOptionsMethods, NELEM(gOptionsMethods));

    return android::RegisterMethodsOrDie(env, "android/graphics/BitmapFactory",

                                         gMethods, NELEM(gMethods));

}

core/jni/android/graphics/BitmapFactory.h

+3 −3
Original line number Diff line number Diff line 
#ifndef BitmapFactory_DEFINE

#define BitmapFactory_DEFINE

#ifndef _ANDROID_GRAPHICS_BITMAP_FACTORY_H_

#define _ANDROID_GRAPHICS_BITMAP_FACTORY_H_



#include "GraphicsJNI.h"
@@ -21,4 +21,4 @@ extern jfieldID gOptions_bitmapFieldID; 


jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format);



#endif
 
#endif  // _ANDROID_GRAPHICS_BITMAP_FACTORY_H_