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

Commit 41ef8e42 authored by Edward Savage-Jones's avatar Edward Savage-Jones Committed by android-build-merger
Browse files

Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff4619 am: f124c726 

am: 99317517

Change-Id: I0a9dbba6c94e4ef9dd36d7a7d43a0c36005f47c7
parents dc03550e 99317517

services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ class MagnificationGestureHandler implements EventStreamTransformation { 
                }

                break;

                case MotionEvent.ACTION_UP: {

                    mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);

                    if (!mMagnificationController.magnificationRegionContains(

                            event.getX(), event.getY())) {

                        transitionToDelegatingState(!mShortcutTriggered);
@@ -703,7 +704,6 @@ class MagnificationGestureHandler implements EventStreamTransformation { 
                    if (mLastDownEvent == null) {

                        return;

                    }

                    mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);

                    if (!GestureUtils.isTap(mLastDownEvent, event, mTapTimeSlop,

                            mTapDistanceSlop, 0)) {

                        transitionToDelegatingState(true);