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

Commit c4c8f2d8 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 78b24b6f: am dacd4751: Merge "Fix Contacts animation jank" into jb-mr2-dev 

* commit '78b24b6f':
  Fix Contacts animation jank
parents 229f1aad 78b24b6f

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ public abstract class HardwareRenderer { 
                        callbacks.onHardwarePreDraw(canvas);



                        if (displayList != null) {

                            status = drawDisplayList(attachInfo, canvas, displayList, status);

                            status |= drawDisplayList(attachInfo, canvas, displayList, status);

                        } else {

                            // Shouldn't reach here

                            view.draw(canvas);

libs/hwui/OpenGLRenderer.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1905,14 +1905,15 @@ void OpenGLRenderer::finishDrawTexture() { 


status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty,

        int32_t replayFlags) {

    status_t status;

    // All the usual checks and setup operations (quickReject, setupDraw, etc.)

    // will be performed by the display list itself

    if (displayList && displayList->isRenderable()) {

        if (CC_UNLIKELY(mCaches.drawDeferDisabled)) {

            startFrame();

            status = startFrame();

            ReplayStateStruct replayStruct(*this, dirty, replayFlags);

            displayList->replay(replayStruct, 0);

            return replayStruct.mDrawGlStatus;

            return status | replayStruct.mDrawGlStatus;

        }



        DeferredDisplayList deferredList;
@@ -1920,9 +1921,9 @@ status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, 
        displayList->defer(deferStruct, 0);



        flushLayers();

        startFrame();

        status = startFrame();



        return deferredList.flush(*this, dirty);

        return status | deferredList.flush(*this, dirty);

    }



    return DrawGlInfo::kStatusDone;