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

Commit f957826d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 1d7ee6b5 to master"

parents 7015154b 712765ff

core/java/android/view/ThreadedRenderer.java

+0 −10
Original line number Diff line number Diff line
@@ -519,16 +519,6 @@ public final class ThreadedRenderer { 
        }

    }



    /**

     * This method should be invoked whenever the current threaded renderer

     * context should be reset.

     *

     * @param surface The surface to render

     */

    void invalidate(Surface surface) {

        updateSurface(surface);

    }



    /**

     * Detaches the layer's surface texture from the GL context and releases

     * the texture id

libs/hwui/renderthread/RenderProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void RenderProxy::updateSurface(const sp<Surface>& surface) { 
    SETUP_TASK(updateSurface);

    args->context = mContext;

    args->surface = surface.get();

    postAndWait(task);

    post(task);

}



CREATE_BRIDGE2(pauseSurface, CanvasContext* context, Surface* surface) {