Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't drop MotionEvents with unknown tool type. #5931

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Don't drop MotionEvents with unknown tool type. #5931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/ui/pointer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ enum PointerDeviceKind {

/// A pointer device with a stylus that has been inverted.
invertedStylus,

/// An unknown pointer device.
unknown
}

/// Information about the state of a pointer.
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/android/io/flutter/view/FlutterView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
private static final int kPointerDeviceKindMouse = 1;
private static final int kPointerDeviceKindStylus = 2;
private static final int kPointerDeviceKindInvertedStylus = 3;
private static final int kPointerDeviceKindUnknown = 4;

private int getPointerChangeForAction(int maskedAction) {
// Primary pointer:
Expand Down Expand Up @@ -416,9 +417,11 @@ private int getPointerDeviceTypeForToolType(int toolType) {
return kPointerDeviceKindStylus;
case MotionEvent.TOOL_TYPE_MOUSE:
return kPointerDeviceKindMouse;
case MotionEvent.TOOL_TYPE_ERASER:
return kPointerDeviceKindInvertedStylus;
default:
// MotionEvent.TOOL_TYPE_UNKNOWN will reach here.
return -1;
return kPointerDeviceKindUnknown;
}
}

Expand All @@ -429,9 +432,6 @@ private void addPointerForIndex(MotionEvent event, int pointerIndex, ByteBuffer
}

int pointerKind = getPointerDeviceTypeForToolType(event.getToolType(pointerIndex));
if (pointerKind == -1) {
return;
}

long timeStamp = event.getEventTime() * 1000; // Convert from milliseconds to microseconds.

Expand Down