Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b74f8b3 authored by Ameer Armaly's avatar Ameer Armaly Committed by Automerger Merge Worker
Browse files

Merge "GestureManifold: fix null pointer exception in onGestureCompleted."... 

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

Change-Id: Ic7907d7364706082fdbd42579ca7b40857618df6
parents 8151421c cee5a217

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

+3 −3
Original line number Diff line number Diff line
@@ -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) {