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

Sync input transactions after ACTION_UP

Browse Source 
Changes to windows can happen before or after a touch gesture. For
example, a window can be dismissed after ACTION_UP occurs. For those
scenarios, sync input transactions after the ACTION_UP event has been
injected.

Bug: 134414988
Test: atest MultiDisplayPolicyTests
Test: atest android.app.cts.DialogTest
Test: TaplTestsQuickstep
Test: atest ActivityLifecycleTopResumedStateTests
Merged-In: I810fad449ea405d104009075d2698109a620a91e
Change-Id: I810fad449ea405d104009075d2698109a620a91e
This commit is contained in:
Siarhei Vishniakou
2019-06-11 18:16:04 -07:00
parent e41abff801
commit f72a71975b
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

@@ -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