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

Commit 65186a22 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

Change-Id: I0b85e0047093adb5b9ff825dd0f4a5615643d81d
parents fc0b9110 0436b01d
Loading
Loading
Loading
Loading
+6 −4
Original line number Original line Diff line number Diff line
@@ -2861,10 +2861,12 @@ void SurfaceFlinger::setTransactionState(
        }
        }
    }
    }


    // If a synchronous transaction is explicitly requested without any changes,
    // If a synchronous transaction is explicitly requested without any changes, force a transaction
    // force a transaction anyway. This can be used as a flush mechanism for
    // anyway. This can be used as a flush mechanism for previous async transactions.
    // previous async transactions.
    // Empty animation transaction can be used to simulate back-pressure, so also force a
    if (transactionFlags == 0 && (flags & eSynchronous)) {
    // transaction for empty animation transactions.
    if (transactionFlags == 0 &&
            ((flags & eSynchronous) || (flags & eAnimation))) {
        transactionFlags = eTransactionNeeded;
        transactionFlags = eTransactionNeeded;
    }
    }