From 7e61d0d0b5a02902db24735dd1baf24a3d421075 Mon Sep 17 00:00:00 2001 From: Ameer Armaly Date: Wed, 24 Nov 2021 16:43:49 -0800 Subject: [PATCH] TouchExplorer: clear unsent hover events on action down. When talkback is detecting gestures, we save hover events in case we want to start touch exploring. Thses need to be cleared every new interaction. Bug: 159651900 Test: atest touchInteractionControllerTest Change-Id: Ia340d96205064bc953df2fbe80f87bc94885af15 --- .../android/server/accessibility/gestures/TouchExplorer.java | 2 ++ 1 file changed, 2 insertions(+) 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 946d22e465890..86777a2f62fd1 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java @@ -537,6 +537,8 @@ public class TouchExplorer extends BaseEventStreamTransformation // touch, we figure out what to do. If were waiting // we resent the delayed callback and wait again. mSendHoverEnterAndMoveDelayed.cancel(); + // clear any hover events that might have been queued and never sent. + mSendHoverEnterAndMoveDelayed.clear(); mSendHoverExitDelayed.cancel(); // If a touch exploration gesture is in progress send events for its end. if (mState.isTouchExploring()) {