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

Commit 8a901f73 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Fix input window commands" into qt-dev 

am: 989d4217

Change-Id: I939da4fc74b0c95e018f17d82dc54b30e4ef2dd3
parents 0b119c2d 989d4217

services/surfaceflinger/SurfaceFlinger.cpp

+4 −3
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ void SurfaceFlinger::updateInputWindowInfo() { 
}



void SurfaceFlinger::commitInputWindowCommands() {

    mInputWindowCommands.merge(mPendingInputWindowCommands);

    mInputWindowCommands = mPendingInputWindowCommands;

    mPendingInputWindowCommands.clear();

}
@@ -3665,8 +3665,9 @@ void SurfaceFlinger::applyTransactionState(const Vector<ComposerState>& states, 
        if (flags & eAnimation) {

            mAnimTransactionPending = true;

        }



        mPendingSyncInputWindows = mPendingInputWindowCommands.syncInputWindows;

        if (mPendingInputWindowCommands.syncInputWindows) {

            mPendingSyncInputWindows = true;

        }



        // applyTransactionState can be called by either the main SF thread or by

        // another process through setTransactionState.  While a given process may wish