Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sync input transactions after ACTION_UP" into qt-dev-plus-aosp

Browse Source 
am: 12a7bb81b3

Change-Id: Icd6ab87749dfd0f1c64d7ae2e8ce66dde55cd00e
This commit is contained in:
Siarhei Vishniakou
2019-06-18 15:32:32 -07:00
committed by android-build-merger
parent 0347191944 12a7bb81b3
commit a2f26840d1
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -7629,22 +7629,30 @@ public class WindowManagerService extends IWindowManager.Stub
@Override
public boolean injectInputAfterTransactionsApplied(InputEvent ev, int mode) {
boolean shouldWaitForAnimToComplete = false;
boolean isDown;
boolean isUp;
if (ev instanceof KeyEvent) {
KeyEvent keyEvent = (KeyEvent) ev;
shouldWaitForAnimToComplete = keyEvent.getSource() == InputDevice.SOURCE_MOUSE
|| keyEvent.getAction() == KeyEvent.ACTION_DOWN;
} else if (ev instanceof MotionEvent) {
isDown = keyEvent.getAction() == KeyEvent.ACTION_DOWN;
isUp = keyEvent.getAction() == KeyEvent.ACTION_UP;
} else {
MotionEvent motionEvent = (MotionEvent) ev;
shouldWaitForAnimToComplete = motionEvent.getSource() == InputDevice.SOURCE_MOUSE
|| motionEvent.getAction() == MotionEvent.ACTION_DOWN;
isDown = 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();
}
return LocalServices.getService(InputManagerInternal.class).injectInputEvent(ev, mode);
final boolean result =
LocalServices.getService(InputManagerInternal.class).injectInputEvent(ev, mode);
if (isUp) {
syncInputTransactions();
}
return result;
}
@Override