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

Commit 8926f912 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exception if receive move withouth down" into rvc-dev am: 46c51b71

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11056879

Change-Id: Ic1065ae4be0aaa260e016791d0b4f6b1146a1468
parents 4b619dd9 46c51b71
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -288,6 +288,11 @@ public class GestureDetector {
     */
    private VelocityTracker mVelocityTracker;

    /**
     * True if the detector can throw exception when touch steam is unexpected .
     */
    private boolean mExceptionForTouchStream;

    /**
     * Consistency verifier for debugging purposes.
     */
@@ -467,6 +472,8 @@ public class GestureDetector {
        mTouchSlopSquare = touchSlop * touchSlop;
        mDoubleTapTouchSlopSquare = doubleTapTouchSlop * doubleTapTouchSlop;
        mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop;
        mExceptionForTouchStream = context != null
                && context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R;
    }

    /**
@@ -639,6 +646,13 @@ public class GestureDetector {
                break;

            case MotionEvent.ACTION_MOVE:
                if (mExceptionForTouchStream && !mStillDown) {
                    throw new IllegalStateException("Incomplete event stream received: "
                            + "Received ACTION_MOVE before ACTION_DOWN. ACTION_DOWN must precede "
                            + "ACTION_MOVE following ACTION_UP or ACTION_CANCEL, or when this "
                            + "GestureDetector has not yet received any events.");
                }

                if (mInLongPress || mInContextClick) {
                    break;
                }