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

Commit 5fd66136 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix out-of-order transactions (2/2)" into oc-dr1-dev am: 0436b01d

am: e89483f1

Change-Id: Iab6cc70e806f9471d83c1a17764db4ebf98f5b37
parents d636f613 e89483f1
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -2919,10 +2919,12 @@ 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)) {
    // 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.
    // Empty animation transaction can be used to simulate back-pressure, so also force a
    // transaction for empty animation transactions.
    if (transactionFlags == 0 &&
            ((flags & eSynchronous) || (flags & eAnimation))) {
        transactionFlags = eTransactionNeeded;
    }