Merge "Sync input transactions after ACTION_UP" into qt-dev (22573ebb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+17 −9

Original line number	Original line	Diff line number	Diff line
	@@ -7626,22 +7626,30 @@ public class WindowManagerService extends IWindowManager.Stub

	@Override		@Override
	public boolean injectInputAfterTransactionsApplied(InputEvent ev, int mode) {		public boolean injectInputAfterTransactionsApplied(InputEvent ev, int mode) {
	boolean shouldWaitForAnimToComplete = false;		boolean isDown;
			boolean isUp;

	if (ev instanceof KeyEvent) {		if (ev instanceof KeyEvent) {
	KeyEvent keyEvent = (KeyEvent) ev;		KeyEvent keyEvent = (KeyEvent) ev;
	shouldWaitForAnimToComplete = keyEvent.getSource() == InputDevice.SOURCE_MOUSE		isDown = keyEvent.getAction() == KeyEvent.ACTION_DOWN;
	\|\| keyEvent.getAction() == KeyEvent.ACTION_DOWN;		isUp = keyEvent.getAction() == KeyEvent.ACTION_UP;
	} else if (ev instanceof MotionEvent) {		} else {
	MotionEvent motionEvent = (MotionEvent) ev;		MotionEvent motionEvent = (MotionEvent) ev;
	shouldWaitForAnimToComplete = motionEvent.getSource() == InputDevice.SOURCE_MOUSE		isDown = motionEvent.getAction() == MotionEvent.ACTION_DOWN;
	\|\| motionEvent.getAction() == MotionEvent.ACTION_DOWN;		isUp = motionEvent.getAction() == MotionEvent.ACTION_UP;
	}		}

	if (shouldWaitForAnimToComplete) {		// For ACTION_DOWN, syncInputTransactions before injecting input.
			// For ACTION_UP, sync after injecting.
			if (isDown) {
	syncInputTransactions();		syncInputTransactions();
	}		}
			final boolean result =
	return LocalServices.getService(InputManagerInternal.class).injectInputEvent(ev, mode);		LocalServices.getService(InputManagerInternal.class).injectInputEvent(ev, mode);
			if (isUp) {
			syncInputTransactions();
			}
			return result;
	}		}

	@Override		@Override