Merge "Exception if receive move withouth down" into rvc-dev am: 46c51b716d am: 073799ef7e am: 8d3d65da33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11056879 Change-Id: Ifad03544675b1af9273c3cbb0907ddd55fa2ccb4
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user