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

Commit bc079c0b authored by Brian Salomon's avatar Brian Salomon Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use legacy local matrix concat order when target API is < U""

parents 54947365 6bdc1b94

libs/hwui/jni/android_graphics_Canvas.cpp

+3 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <android/api-level.h>

#else

#define __ANDROID_API_P__ 28

#define __ANDROID_API_U__ 34

#endif

#include <androidfw/ResourceTypes.h>

#include <hwui/Canvas.h>
@@ -31,9 +30,8 @@ 
#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedStringChars.h>



#include "Bitmap.h"

#include "FontUtils.h"

#include "SkAndroidFrameworkUtils.h"

#include "Bitmap.h"

#include "SkBitmap.h"

#include "SkBlendMode.h"

#include "SkClipOp.h"
@@ -44,10 +42,10 @@ 
#include "SkMatrix.h"

#include "SkPath.h"

#include "SkPoint.h"

#include "SkRRect.h"

#include "SkRect.h"

#include "SkRefCnt.h"

#include "SkRegion.h"

#include "SkRRect.h"

#include "SkScalar.h"

#include "SkVertices.h"
@@ -712,9 +710,6 @@ static void freeTextLayoutCaches(JNIEnv* env, jobject) { 


static void setCompatibilityVersion(JNIEnv* env, jobject, jint apiLevel) {

    Canvas::setCompatibilityVersion(apiLevel);

    if (apiLevel < __ANDROID_API_U__) {

        SkAndroidFrameworkUtils::UseLegacyLocalMatrixConcatenation();

    }

}



static void punchHole(JNIEnv* env, jobject, jlong canvasPtr, jfloat left, jfloat top, jfloat right,
@@ -805,6 +800,7 @@ int register_android_graphics_Canvas(JNIEnv* env) { 
    ret |= RegisterMethodsOrDie(env, "android/graphics/BaseCanvas", gDrawMethods, NELEM(gDrawMethods));

    ret |= RegisterMethodsOrDie(env, "android/graphics/BaseRecordingCanvas", gDrawMethods, NELEM(gDrawMethods));

    return ret;



}



}; // namespace android