Merge "SurfaceFlinger: Ensure syncInputWindows is processed." into rvc-dev am:... (8133efed) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2808,7 +2808,7 @@ void SurfaceFlinger::updateInputWindowInfo() {
	}		}

	void SurfaceFlinger::commitInputWindowCommands() {		void SurfaceFlinger::commitInputWindowCommands() {
	mInputWindowCommands = mPendingInputWindowCommands;		mInputWindowCommands.merge(mPendingInputWindowCommands);
	mPendingInputWindowCommands.clear();		mPendingInputWindowCommands.clear();
	}		}

	@@ -5779,6 +5779,7 @@ void SurfaceFlinger::setInputWindowsFinished() {
	Mutex::Autolock _l(mStateLock);		Mutex::Autolock _l(mStateLock);

	mPendingSyncInputWindows = false;		mPendingSyncInputWindows = false;

	mTransactionCV.broadcast();		mTransactionCV.broadcast();
	}		}