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

Commit 4fb6416e authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "we need to guarantee that h/w comp set() is called when a buffer has... 

Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0
parents fefffc68 e757a87f

services/surfaceflinger/SurfaceFlinger.cpp

+8 −10
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ bool SurfaceFlinger::threadLoop() 
    }



    const DisplayHardware& hw(graphicPlane(0).displayHardware());

    if (LIKELY(hw.canDraw() && !isFrozen())) {

    if (LIKELY(hw.canDraw())) {

        // repaint the framebuffer (if needed)



        const int index = hw.getCurrentBufferIndex();
@@ -479,7 +479,6 @@ bool SurfaceFlinger::threadLoop() 


void SurfaceFlinger::postFramebuffer()

{

    if (!mSwapRegion.isEmpty()) {

    const DisplayHardware& hw(graphicPlane(0).displayHardware());

    const nsecs_t now = systemTime();

    mDebugInSwapBuffers = now;
@@ -488,7 +487,6 @@ void SurfaceFlinger::postFramebuffer() 
    mDebugInSwapBuffers = 0;

    mSwapRegion.clear();

}

}



void SurfaceFlinger::handleConsoleEvents()

{