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

Merge "Fix incorrect logic in touch explorer state transitions." into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-19 18:48:12 +00:00
committed by Android (Google) Code Review
parent a55382eb88 f924ff4f37
commit 84c2fd772e
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
View File

@@ -1417,20 +1417,29 @@ public class TouchExplorer extends BaseEventStreamTransformation
mSendTouchExplorationEndDelayed.forceSendAndRemove();
}
}
if (!mState.isTouchInteracting()) {
if (!mState.isTouchInteracting() && !mState.isDragging()) {
// It makes no sense to delegate.
Slog.e(LOG_TAG, "Error: Trying to delegate from "
+ mState.getStateSymbolicName(mState.getState()));
Slog.e(
LOG_TAG,
"Error: Trying to delegate from "
+ mState.getStateSymbolicName(mState.getState()));
return;
}
mState.startDelegating();
MotionEvent prototype = mState.getLastReceivedEvent();
if (prototype == null) {
MotionEvent event = mState.getLastReceivedEvent();
MotionEvent rawEvent = mState.getLastReceivedRawEvent();
if (event == null || rawEvent == null) {
Slog.d(LOG_TAG, "Unable to start delegating: unable to get last received event.");
return;
}
int policyFlags = mState.getLastReceivedPolicyFlags();
mDispatcher.sendDownForAllNotInjectedPointers(prototype, policyFlags);
if (mState.isDragging()) {
// Send an event to the end of the drag gesture.
mDispatcher.sendMotionEvent(
event, ACTION_UP, rawEvent, ALL_POINTER_ID_BITS, policyFlags);
}
mState.startDelegating();
// Deliver all pointers to the view hierarchy.
mDispatcher.sendDownForAllNotInjectedPointers(event, policyFlags);
}
}