Merge "GestureManifold: fix null pointer exception in onGestureCompleted." into rvc-dev (cee5a217) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -295,7 +295,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
	mListener.onGestureStarted();		mListener.onGestureStarted();
	}		}
	} else if (state == GestureMatcher.STATE_GESTURE_COMPLETED) {		} else if (state == GestureMatcher.STATE_GESTURE_COMPLETED) {
	onGestureCompleted(gestureId);		onGestureCompleted(gestureId, event, rawEvent, policyFlags);
	} else if (state == GestureMatcher.STATE_GESTURE_CANCELED && mState.isGestureDetecting()) {		} else if (state == GestureMatcher.STATE_GESTURE_CANCELED && mState.isGestureDetecting()) {
	// We only want to call the cancelation callback if there are no other pending		// We only want to call the cancelation callback if there are no other pending
	// detectors.		// detectors.
	@@ -311,8 +311,8 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
	}		}
	}		}

	private void onGestureCompleted(int gestureId) {		private void onGestureCompleted(
	MotionEvent event = mState.getLastReceivedEvent();		int gestureId, MotionEvent event, MotionEvent rawEvent, int policyFlags) {
	// Note that gestures that complete immediately call clear() from onMotionEvent.		// Note that gestures that complete immediately call clear() from onMotionEvent.
	// Gestures that complete on a delay call clear() here.		// Gestures that complete on a delay call clear() here.
	switch (gestureId) {		switch (gestureId) {