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

Commit 056bcf6e authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Removing incorrect @CriticalNative" into main

parents 848ce906 d5ab703c

graphics/java/android/graphics/RecordingCanvas.java

+0 −2
Original line number Diff line number Diff line
@@ -276,9 +276,7 @@ public final class RecordingCanvas extends BaseRecordingCanvas { 
    @CriticalNative

    private static native void nResetDisplayListCanvas(long canvas, long node,

            int width, int height);

    @CriticalNative

    private static native int nGetMaximumTextureWidth();

    @CriticalNative

    private static native int nGetMaximumTextureHeight();

    @CriticalNative

    private static native void nEnableZ(long renderer, boolean enableZ);

libs/hwui/jni/android_graphics_DisplayListCanvas.cpp

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void android_view_DisplayListCanvas_resetDisplayListCanvas(CRITICAL_JNI_P 
    canvas->resetRecording(width, height, renderNode);

}



static jint android_view_DisplayListCanvas_getMaxTextureSize(CRITICAL_JNI_PARAMS) {

static jint android_view_DisplayListCanvas_getMaxTextureSize(JNIEnv*, jobject) {

#ifdef __ANDROID__ // Layoutlib does not support RenderProxy (RenderThread)

    return android::uirenderer::renderthread::RenderProxy::maxTextureSize();

#else
@@ -175,14 +175,14 @@ static void android_view_DisplayListCanvas_drawWebViewFunctor(CRITICAL_JNI_PARAM 
const char* const kClassPathName = "android/graphics/RecordingCanvas";



static JNINativeMethod gMethods[] = {

        {"nGetMaximumTextureWidth", "()I", (void*)android_view_DisplayListCanvas_getMaxTextureSize},

        {"nGetMaximumTextureHeight", "()I",

         (void*)android_view_DisplayListCanvas_getMaxTextureSize},

        // ------------ @CriticalNative --------------

        {"nCreateDisplayListCanvas", "(JII)J",

         (void*)android_view_DisplayListCanvas_createDisplayListCanvas},

        {"nResetDisplayListCanvas", "(JJII)V",

         (void*)android_view_DisplayListCanvas_resetDisplayListCanvas},

        {"nGetMaximumTextureWidth", "()I", (void*)android_view_DisplayListCanvas_getMaxTextureSize},

        {"nGetMaximumTextureHeight", "()I",

         (void*)android_view_DisplayListCanvas_getMaxTextureSize},

        {"nEnableZ", "(JZ)V", (void*)android_view_DisplayListCanvas_enableZ},

        {"nFinishRecording", "(JJ)V", (void*)android_view_DisplayListCanvas_finishRecording},

        {"nDrawRenderNode", "(JJ)V", (void*)android_view_DisplayListCanvas_drawRenderNode},