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

Commit 2d10b6df authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev 

am: 7443c1f2

* commit '7443c1f2':
  SF: Force empty sync transactions to apply anyway

Change-Id: Ic5b1f24f75027800429641eb3c2879a5742e130d
parents 261a7339 7443c1f2

services/surfaceflinger/SurfaceFlinger.cpp

+7 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,13 @@ void SurfaceFlinger::setTransactionState( 
        }

    }



    // If a synchronous transaction is explicitly requested without any changes,

    // force a transaction anyway. This can be used as a flush mechanism for

    // previous async transactions.

    if (transactionFlags == 0 && (flags & eSynchronous)) {

        transactionFlags = eTransactionNeeded;

    }



    if (transactionFlags) {

        // this triggers the transaction

        setTransactionFlags(transactionFlags);

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+7 −0
Original line number Diff line number Diff line
@@ -2177,6 +2177,13 @@ void SurfaceFlinger::setTransactionState( 
        }

    }



    // If a synchronous transaction is explicitly requested without any changes,

    // force a transaction anyway. This can be used as a flush mechanism for

    // previous async transactions.

    if (transactionFlags == 0 && (flags & eSynchronous)) {

        transactionFlags = eTransactionNeeded;

    }



    if (transactionFlags) {

        // this triggers the transaction

        setTransactionFlags(transactionFlags);