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

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

Merge "IllegalArgumentException in MagnificationGestureHandler" 

am: 7aff4619

Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f
parents 069915cd 7aff4619

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);