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

Commit f7ae86f6 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a... 

am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0

* commit '4fb6416e':
  we need to guarantee that h/w comp set() is called when a buffer has been retired
parents 1c8a6bf3 4fb6416e

services/surfaceflinger/SurfaceFlinger.cpp

+7 −9
Original line number Original line Diff line number Diff line
@@ -445,7 +445,6 @@ bool SurfaceFlinger::threadLoop() 




void SurfaceFlinger::postFramebuffer()

void SurfaceFlinger::postFramebuffer()

{

{

    if (!mSwapRegion.isEmpty()) {

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

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

    const nsecs_t now = systemTime();

    const nsecs_t now = systemTime();

    mDebugInSwapBuffers = now;

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

    mDebugInSwapBuffers = 0;

    mSwapRegion.clear();

    mSwapRegion.clear();

}

}

}





void SurfaceFlinger::handleConsoleEvents()

void SurfaceFlinger::handleConsoleEvents()

{

{