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

Commit 61d9ffbf authored by Wei-Ta Chen's avatar Wei-Ta Chen Committed by Android (Google) Code Review
Browse files

Merge "Do not merge." into gingerbread

parents 4330b146 25bce3a6

api/current.xml

+151 −1
Original line number Diff line number Diff line
@@ -59890,6 +59890,16 @@ 
 visibility="public"

>

</field>

<field name="inPreferQualityOverSpeed"

 type="boolean"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="inPreferredConfig"

 type="android.graphics.Bitmap.Config"

 transient="false"
@@ -60002,6 +60012,146 @@ 
>

</field>

</class>

<class name="BitmapRegionDecoder"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="decodeRegion"

 return="android.graphics.Bitmap"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="rect" type="android.graphics.Rect">

</parameter>

<parameter name="options" type="android.graphics.BitmapFactory.Options">

</parameter>

</method>

<method name="getHeight"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getWidth"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isRecycled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="newInstance"

 return="android.graphics.BitmapRegionDecoder"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="data" type="byte[]">

</parameter>

<parameter name="offset" type="int">

</parameter>

<parameter name="length" type="int">

</parameter>

<parameter name="isShareable" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="newInstance"

 return="android.graphics.BitmapRegionDecoder"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="fd" type="java.io.FileDescriptor">

</parameter>

<parameter name="isShareable" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="newInstance"

 return="android.graphics.BitmapRegionDecoder"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="is" type="java.io.InputStream">

</parameter>

<parameter name="isShareable" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="newInstance"

 return="android.graphics.BitmapRegionDecoder"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pathName" type="java.lang.String">

</parameter>

<parameter name="isShareable" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="recycle"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="BitmapShader"

 extends="android.graphics.Shader"

 abstract="false"
@@ -226236,7 +226386,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ LOCAL_SRC_FILES:= \ 
	android_graphics_PixelFormat.cpp \

	android/graphics/Picture.cpp \

	android/graphics/PorterDuff.cpp \

	android/graphics/BitmapRegionDecoder.cpp \

	android/graphics/Rasterizer.cpp \

	android/graphics/Region.cpp \

	android/graphics/Shader.cpp \

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern int register_android_os_Binder(JNIEnv* env); 
extern int register_android_os_Process(JNIEnv* env);

extern int register_android_graphics_Bitmap(JNIEnv*);

extern int register_android_graphics_BitmapFactory(JNIEnv*);

extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*);

extern int register_android_graphics_Camera(JNIEnv* env);

extern int register_android_graphics_Graphics(JNIEnv* env);

extern int register_android_graphics_Interpolator(JNIEnv* env);
@@ -1209,6 +1210,7 @@ static const RegJNIRec gRegJNI[] = { 


    REG_JNI(register_android_graphics_Bitmap),

    REG_JNI(register_android_graphics_BitmapFactory),

    REG_JNI(register_android_graphics_BitmapRegionDecoder),

    REG_JNI(register_android_graphics_Camera),

    REG_JNI(register_android_graphics_Canvas),

    REG_JNI(register_android_graphics_ColorFilter),

core/jni/android/graphics/BitmapFactory.cpp

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ jfieldID gOptions_ditherFieldID; 
jfieldID gOptions_purgeableFieldID;

jfieldID gOptions_shareableFieldID;

jfieldID gOptions_nativeAllocFieldID;

jfieldID gOptions_preferQualityOverSpeedFieldID;

jfieldID gOptions_widthFieldID;

jfieldID gOptions_heightFieldID;

jfieldID gOptions_mimeFieldID;
@@ -180,6 +181,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
    bool isPurgeable = forcePurgeable ||

                        (allowPurgeable && optionsPurgeable(env, options));

    bool reportSizeToVM = optionsReportSizeToVM(env, options);

    bool preferQualityOverSpeed = false;

    

    if (NULL != options) {

        sampleSize = env->GetIntField(options, gOptions_sampleSizeFieldID);
@@ -194,6 +196,8 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
        jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);

        prefConfig = GraphicsJNI::getNativeBitmapConfig(env, jconfig);

        doDither = env->GetBooleanField(options, gOptions_ditherFieldID);

        preferQualityOverSpeed = env->GetBooleanField(options,

                gOptions_preferQualityOverSpeedFieldID);

    }



    SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
@@ -203,6 +207,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
    

    decoder->setSampleSize(sampleSize);

    decoder->setDitherImage(doDither);

    decoder->setPreferQualityOverSpeed(preferQualityOverSpeed);



    NinePatchPeeker     peeker(decoder);

    JavaPixelAllocator  javaAllocator(env, reportSizeToVM);
@@ -551,6 +556,8 @@ int register_android_graphics_BitmapFactory(JNIEnv* env) { 
    gOptions_purgeableFieldID = getFieldIDCheck(env, gOptions_class, "inPurgeable", "Z");

    gOptions_shareableFieldID = getFieldIDCheck(env, gOptions_class, "inInputShareable", "Z");

    gOptions_nativeAllocFieldID = getFieldIDCheck(env, gOptions_class, "inNativeAlloc", "Z");

    gOptions_preferQualityOverSpeedFieldID = getFieldIDCheck(env, gOptions_class,

            "inPreferQualityOverSpeed", "Z");

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

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

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

core/jni/android/graphics/BitmapFactory.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ extern jfieldID gOptions_ditherFieldID; 
extern jfieldID gOptions_purgeableFieldID;

extern jfieldID gOptions_shareableFieldID;

extern jfieldID gOptions_nativeAllocFieldID;

extern jfieldID gOptions_preferQualityOverSpeedFieldID;

extern jfieldID gOptions_widthFieldID;

extern jfieldID gOptions_heightFieldID;

extern jfieldID gOptions_mimeFieldID;