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

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

Merge "Fix wrong-thread issue" into lmp-mr1-dev

parents 3546c9a5 12f5e343

core/java/android/view/GLES20Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ class GLES20Canvas extends HardwareCanvas { 


    void drawHardwareLayer(HardwareLayer layer, float x, float y, Paint paint) {

        layer.setLayerPaint(paint);

        nDrawLayer(mRenderer, layer.getLayer(), x, y);

        nDrawLayer(mRenderer, layer.getLayerHandle(), x, y);

    }



    private static native void nDrawLayer(long renderer, long layer, float x, float y);

core/java/android/view/HardwareLayer.java

+2 −3
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ final class HardwareLayer { 
        mRenderer.detachSurfaceTexture(mFinalizer.get());

    }



    public long getLayer() {

        return nGetLayer(mFinalizer.get());

    public long getLayerHandle() {

        return mFinalizer.get();

    }



    public void setSurfaceTexture(SurfaceTexture surface) {
@@ -153,6 +153,5 @@ final class HardwareLayer { 
    private static native void nUpdateRenderLayer(long layerUpdater, long displayList,

            int left, int top, int right, int bottom);



    private static native long nGetLayer(long layerUpdater);

    private static native int nGetTexName(long layerUpdater);

}

core/jni/android_view_GLES20Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static jint android_view_GLES20Canvas_drawRenderNode(JNIEnv* env, 
static void android_view_GLES20Canvas_drawLayer(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jlong layerPtr, jfloat x, jfloat y) {

    DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr);

    Layer* layer = reinterpret_cast<Layer*>(layerPtr);

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerPtr);

    renderer->drawLayer(layer, x, y);

}

core/jni/android_view_HardwareLayer.cpp

+0 −7
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ static void android_view_HardwareLayer_updateSurfaceTexture(JNIEnv* env, jobject 
    layer->updateTexImage();

}



static jlong android_view_HardwareLayer_getLayer(JNIEnv* env, jobject clazz,

        jlong layerUpdaterPtr) {

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerUpdaterPtr);

    return reinterpret_cast<jlong>( layer->backingLayer() );

}



static jint android_view_HardwareLayer_getTexName(JNIEnv* env, jobject clazz,

        jlong layerUpdaterPtr) {

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerUpdaterPtr);
@@ -111,7 +105,6 @@ static JNINativeMethod gMethods[] = { 
            (void*) android_view_HardwareLayer_setSurfaceTexture },

    { "nUpdateSurfaceTexture",   "(J)V",       (void*) android_view_HardwareLayer_updateSurfaceTexture },



    { "nGetLayer",               "(J)J",       (void*) android_view_HardwareLayer_getLayer },

    { "nGetTexName",             "(J)I",       (void*) android_view_HardwareLayer_getTexName },

#endif

};

libs/hwui/DeferredLayerUpdater.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public: 


    ANDROID_API bool apply();



    ANDROID_API Layer* backingLayer() {

    Layer* backingLayer() {

        return mLayer;

    }