Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix PlatformView multiple pointer crash caused by toMotionEvent #34182

Merged
auto-submit merged 2 commits into from
Aug 15, 2022
Merged

Fix PlatformView multiple pointer crash caused by toMotionEvent #34182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991471b
Fix PlatformView multiple pointer crash caused by toMotionEvent
mengdouer Jun 20, 2022
9959c86
add test
mengdouer Aug 8, 2022
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
2 changes: 1 addition & 1 deletion shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ public MotionEvent toMotionEvent(
return MotionEvent.obtain(
trackedEvent.getDownTime(),
trackedEvent.getEventTime(),
trackedEvent.getAction(),
touch.action,
touch.pointerCount,
pointerProperties,
pointerCoords,
Expand Down
48 changes: 46 additions & 2 deletions shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,51 @@ public void itUsesActionEventTypeFromFrameworkEventForVirtualDisplays() {
assertNotEquals(resolvedEvent.getAction(), original.getAction());
}

@Test
public void itUsesActionEventTypeFromFrameworkEventAsActionChanged() {
MotionEventTracker motionEventTracker = MotionEventTracker.getInstance();
PlatformViewsController platformViewsController = new PlatformViewsController();

MotionEvent original =
MotionEvent.obtain(
10, // downTime
10, // eventTime
261, // action
0, // x
0, // y
0 // metaState
);

MotionEventTracker.MotionEventId motionEventId = motionEventTracker.track(original);

PlatformViewTouch frameWorkTouch =
new PlatformViewTouch(
0, // viewId
original.getDownTime(),
original.getEventTime(),
0, // action
1, // pointerCount
Arrays.asList(Arrays.asList(0, 0)), // pointer properties
Arrays.asList(Arrays.asList(0., 1., 2., 3., 4., 5., 6., 7., 8.)), // pointer coords
original.getMetaState(),
original.getButtonState(),
original.getXPrecision(),
original.getYPrecision(),
original.getDeviceId(),
original.getEdgeFlags(),
original.getSource(),
original.getFlags(),
motionEventId.getId());
MotionEvent resolvedEvent =
platformViewsController.toMotionEvent(
1, // density
frameWorkTouch,
false // usingVirtualDisplays
);
assertEquals(resolvedEvent.getAction(), frameWorkTouch.action);
assertNotEquals(resolvedEvent.getAction(), original.getAction());
}

@Ignore
@Test
public void itUsesActionEventTypeFromMotionEventForHybridPlatformViews() {
Expand Down Expand Up @@ -214,8 +259,7 @@ public void itUsesActionEventTypeFromMotionEventForHybridPlatformViews() {
platformViewsController.toMotionEvent(
/*density=*/ 1, frameWorkTouch, /*usingVirtualDisplay=*/ false);

assertNotEquals(resolvedEvent.getAction(), frameWorkTouch.action);
assertEquals(resolvedEvent.getAction(), original.getAction());
assertEquals(resolvedEvent.getAction(), frameWorkTouch.action);
}

@Test
Expand Down