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

Merge "GestureManifold: fix null pointer exception in onGestureCompleted." into rvc-dev

Browse Source
This commit is contained in:
Ameer Armaly
2020-05-21 20:24:30 +00:00
committed by Android (Google) Code Review
parent 71765aa97c 3921cf7a9d
commit cee5a21750
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java
View File

@@ -295,7 +295,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
mListener.onGestureStarted();
}
} else if (state == GestureMatcher.STATE_GESTURE_COMPLETED) {
onGestureCompleted(gestureId);
onGestureCompleted(gestureId, event, rawEvent, policyFlags);
} else if (state == GestureMatcher.STATE_GESTURE_CANCELED && mState.isGestureDetecting()) {
// We only want to call the cancelation callback if there are no other pending
// detectors.
@@ -311,8 +311,8 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
}
}
private void onGestureCompleted(int gestureId) {
MotionEvent event = mState.getLastReceivedEvent();
private void onGestureCompleted(
int gestureId, MotionEvent event, MotionEvent rawEvent, int policyFlags) {
// Note that gestures that complete immediately call clear() from onMotionEvent.
// Gestures that complete on a delay call clear() here.
switch (gestureId) {