Merge "Remove redundant code logic to improve readability" into main
diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/MultiTap.java b/services/accessibility/java/com/android/server/accessibility/gestures/MultiTap.java
index 95559802..7f79556 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/MultiTap.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/MultiTap.java
@@ -89,7 +89,7 @@
@Override
protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
- cancelAfterDoubleTapTimeout(event, rawEvent, policyFlags);
+ cancelPendingTransitions();
if (!isInsideSlop(rawEvent, mTouchSlop)) {
cancelGesture(event, rawEvent, policyFlags);
}
diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/MultiTapAndHold.java b/services/accessibility/java/com/android/server/accessibility/gestures/MultiTapAndHold.java
index 15e1278..872ade5 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/MultiTapAndHold.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/MultiTapAndHold.java
@@ -46,7 +46,6 @@
@Override
protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
super.onUp(event, rawEvent, policyFlags);
- cancelAfterDoubleTapTimeout(event, rawEvent, policyFlags);
}
@Override