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

Commit da8ca93b authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "SF: Prevent non-sync transactions from syncing" into nyc-dev

parents c30e3e7c 792e529d

services/surfaceflinger/Layer.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -1000,8 +1000,9 @@ bool Layer::applyPendingStates() { 
                // Signal our end of the sync point and then dispose of it

                // Signal our end of the sync point and then dispose of it

                mRemoteSyncPoints.front()->setTransactionApplied();

                mRemoteSyncPoints.front()->setTransactionApplied();

                mRemoteSyncPoints.pop_front();

                mRemoteSyncPoints.pop_front();

            }

            } else {

                break;

                break;

            }

        } else {

        } else {

            popPendingState();

            popPendingState();

            stateUpdateAvailable = true;

            stateUpdateAvailable = true;
@@ -1240,6 +1241,8 @@ void Layer::deferTransactionUntil(const sp<IBinder>& handle, 
    // request without any other state updates shouldn't actually induce a delay

    // request without any other state updates shouldn't actually induce a delay

    mCurrentState.modified = true;

    mCurrentState.modified = true;

    pushPendingState();

    pushPendingState();

    mCurrentState.handle = nullptr;

    mCurrentState.frameNumber = 0;

    mCurrentState.modified = false;

    mCurrentState.modified = false;

}

}