Merge "Exception if receive move withouth down" into rvc-dev (46c51b71) · Commits · e / os / android_frameworks_base

core/java/android/view/GestureDetector.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -288,6 +288,11 @@ public class GestureDetector {
	*/		*/
	private VelocityTracker mVelocityTracker;		private VelocityTracker mVelocityTracker;

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

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

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

	case MotionEvent.ACTION_MOVE:		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) {		if (mInLongPress \|\| mInContextClick) {
	break;		break;
	}		}