summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ameer Armaly <aarmaly@google.com> 2023-07-28 19:50:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-28 19:50:27 +0000
commita8f5ae3cc2bc494fd2f6a96f00392db278788433 (patch)
treeb1e538528ea1019bf554578105d83f2d3e14eb66
parent3252ea9da4f03485513c352e61fdc973376414fa (diff)
parenta9dafc3734278335f0dc1f033c34d9a0e52e8c89 (diff)
Merge "Make sure to send HOVER_EXIT when starting touch exploration if we haven't sent it already." into main am: 6c737e8ca0 am: 9e901f2cdf am: a9dafc3734
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2677516 Change-Id: I8f6b59a90f72ef2dbba636fd15b86492ad1388ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
index 777c7c8e0da9..9b9593b2b99a 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
@@ -1344,6 +1344,8 @@ public class TouchExplorer extends BaseEventStreamTransformation
Slog.e(LOG_TAG, "Unable to find a valid pointer for touch exploration.");
return;
}
+ // Send hover exit if we haven't closed a previous touch exploration event stream.
+ sendHoverExitAndTouchExplorationGestureEndIfNeeded(pointerId);
final int pointerIdBits = (1 << pointerId);
final int policyFlags = mState.getLastReceivedPolicyFlags();
mSendHoverEnterAndMoveDelayed.setPointerIdBits(pointerIdBits);