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

Commit 80db3867 authored by Valerie Hau's avatar Valerie Hau Committed by android-build-merger
Browse files

Merge "Removing blocking from animation on main thread" into qt-dev am: e6aef129 

am: 4b6f3b4c

Change-Id: Ic25a3223432626375928c0b8c4fa626be3a518ba
parents c91a6d59 4b6f3b4c

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3586,7 +3586,7 @@ void SurfaceFlinger::applyTransactionState(const Vector<ComposerState>& states, 
    if (flags & eAnimation) {

    if (flags & eAnimation) {

        // For window updates that are part of an animation we must wait for

        // For window updates that are part of an animation we must wait for

        // previous animation "frames" to be handled.

        // previous animation "frames" to be handled.

        while (mAnimTransactionPending) {

        while (!isMainThread && mAnimTransactionPending) {

            status_t err = mTransactionCV.waitRelative(mStateLock, s2ns(5));

            status_t err = mTransactionCV.waitRelative(mStateLock, s2ns(5));

            if (CC_UNLIKELY(err != NO_ERROR)) {

            if (CC_UNLIKELY(err != NO_ERROR)) {

                // just in case something goes wrong in SF, return to the

                // just in case something goes wrong in SF, return to the