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

Commit 356b1777 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Cleanup properties" into mnc-dev

parents d6abbd29 2507c34d

core/java/android/view/DisplayListCanvas.java

+0 −6
Original line number Diff line number Diff line
@@ -93,12 +93,6 @@ public class DisplayListCanvas extends Canvas { 


    private static native long nCreateDisplayListCanvas();



    public static void setProperty(String name, String value) {

        nSetProperty(name, value);

    }



    private static native void nSetProperty(String name, String value);



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

    // Canvas management

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

core/java/android/view/ThreadedRenderer.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;
@@ -412,6 +413,13 @@ public class ThreadedRenderer extends HardwareRenderer { 
        nTrimMemory(level);

    }



    public static void overrideProperty(@NonNull String name, @NonNull String value) {

        if (name == null || value == null) {

            throw new IllegalArgumentException("name and value must be non-null");

        }

        nOverrideProperty(name, value);

    }



    public static void dumpProfileData(byte[] data, FileDescriptor fd) {

        nDumpProfileData(data, fd);

    }
@@ -510,6 +518,7 @@ public class ThreadedRenderer extends HardwareRenderer { 


    private static native void nDestroyHardwareResources(long nativeProxy);

    private static native void nTrimMemory(int level);

    private static native void nOverrideProperty(String name, String value);



    private static native void nFence(long nativeProxy);

    private static native void nStopDrawing(long nativeProxy);

core/jni/android_view_DisplayListCanvas.cpp

+0 −20
Original line number Diff line number Diff line
@@ -86,24 +86,6 @@ static void android_view_DisplayListCanvas_finish(JNIEnv* env, jobject clazz, 
    renderer->finish();

}



static void android_view_DisplayListCanvas_setProperty(JNIEnv* env,

        jobject clazz, jstring name, jstring value) {

    if (!Caches::hasInstance()) {

        ALOGW("can't set property, no Caches instance");

        return;

    }



    if (name == NULL || value == NULL) {

        ALOGW("can't set prop, null passed");

    }



    const char* nameCharArray = env->GetStringUTFChars(name, NULL);

    const char* valueCharArray = env->GetStringUTFChars(value, NULL);

    Caches::getInstance().setTempProperty(nameCharArray, valueCharArray);

    env->ReleaseStringUTFChars(name, nameCharArray);

    env->ReleaseStringUTFChars(name, valueCharArray);

}



// ----------------------------------------------------------------------------

// Functor

// ----------------------------------------------------------------------------
@@ -268,8 +250,6 @@ static JNINativeMethod gMethods[] = { 
    { "nPrepare",           "(J)V",            (void*) android_view_DisplayListCanvas_prepare },

    { "nPrepareDirty",      "(JIIII)V",        (void*) android_view_DisplayListCanvas_prepareDirty },

    { "nFinish",            "(J)V",            (void*) android_view_DisplayListCanvas_finish },

    { "nSetProperty",       "(Ljava/lang/String;Ljava/lang/String;)V",

            (void*) android_view_DisplayListCanvas_setProperty },



    { "nCallDrawGLFunction", "(JJ)V",          (void*) android_view_DisplayListCanvas_callDrawGLFunction },

core/jni/android_view_ThreadedRenderer.cpp

+10 −0
Original line number Diff line number Diff line
@@ -388,6 +388,15 @@ static void android_view_ThreadedRenderer_trimMemory(JNIEnv* env, jobject clazz, 
    RenderProxy::trimMemory(level);

}



static void android_view_ThreadedRenderer_overrideProperty(JNIEnv* env, jobject clazz,

        jstring name, jstring value) {

    const char* nameCharArray = env->GetStringUTFChars(name, NULL);

    const char* valueCharArray = env->GetStringUTFChars(value, NULL);

    RenderProxy::overrideProperty(nameCharArray, valueCharArray);

    env->ReleaseStringUTFChars(name, nameCharArray);

    env->ReleaseStringUTFChars(name, valueCharArray);

}



static void android_view_ThreadedRenderer_fence(JNIEnv* env, jobject clazz,

        jlong proxyPtr) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
@@ -466,6 +475,7 @@ static JNINativeMethod gMethods[] = { 
    { "nDetachSurfaceTexture", "(JJ)V", (void*) android_view_ThreadedRenderer_detachSurfaceTexture },

    { "nDestroyHardwareResources", "(J)V", (void*) android_view_ThreadedRenderer_destroyHardwareResources },

    { "nTrimMemory", "(I)V", (void*) android_view_ThreadedRenderer_trimMemory },

    { "nOverrideProperty", "(Ljava/lang/String;Ljava/lang/String;)V",  (void*) android_view_ThreadedRenderer_overrideProperty },

    { "nFence", "(J)V", (void*) android_view_ThreadedRenderer_fence },

    { "nStopDrawing", "(J)V", (void*) android_view_ThreadedRenderer_stopDrawing },

    { "nNotifyFramePending", "(J)V", (void*) android_view_ThreadedRenderer_notifyFramePending },

libs/hwui/Android.common.mk

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

    Program.cpp \

    ProgramCache.cpp \

    Properties.cpp \

    RenderBufferCache.cpp \

    RenderNode.cpp \

    RenderProperties.cpp \