Fix unexpected pointer change (#129765)

MotionEvent.isFromSource() is not mockable because it's from super class in InputEvent.
So we need to change if condition from "if (!isPointerEvent || !isMovementEvent)"
to "if (isPointerEvent || isMovementEvent)". Without this change, this test case will
end up with "wanted but not invoked" error.

Signed-off-by: xiaohu.hxh <[email protected]>

Author: LoveJello

shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java

@@ -13,9 +13,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.flutter.Log;
+
 /** Sends touch information from Android to Flutter in a format that Flutter understands. */
 public class AndroidTouchProcessor {
 
+  private static final String TAG = "AndroidTouchProcessor";
   // Must match the PointerChange enum in pointer.dart.
   @IntDef({
     PointerChange.CANCEL,
@@ -109,6 +112,7 @@ public AndroidTouchProcessor(@NonNull FlutterRenderer renderer, boolean trackMot
   }
 
   public boolean onTouchEvent(@NonNull MotionEvent event) {
+    Log.v(TAG, "onTouchEvent, event " + event);
     return onTouchEvent(event, IDENTITY_TRANSFORM);
   }
 
@@ -186,29 +190,33 @@ public boolean onTouchEvent(@NonNull MotionEvent event, @NonNull Matrix transfor
   public boolean onGenericMotionEvent(@NonNull MotionEvent event) {
     // Method isFromSource is only available in API 18+ (Jelly Bean MR2)
     // Mouse hover support is not implemented for API < 18.
+
+    Log.v(TAG, "onGenericMotionEvent, event " + event);
+
     boolean isPointerEvent =
         Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
             && event.isFromSource(InputDevice.SOURCE_CLASS_POINTER);
+
     boolean isMovementEvent =
         (event.getActionMasked() == MotionEvent.ACTION_HOVER_MOVE
             || event.getActionMasked() == MotionEvent.ACTION_SCROLL);
-    if (!isPointerEvent || !isMovementEvent) {
-      return false;
-    }
-
-    int pointerChange = getPointerChangeForAction(event.getActionMasked());
-    ByteBuffer packet =
-        ByteBuffer.allocateDirect(
-            event.getPointerCount() * POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD);
-    packet.order(ByteOrder.LITTLE_ENDIAN);
 
-    // ACTION_HOVER_MOVE always applies to a single pointer only.
-    addPointerForIndex(event, event.getActionIndex(), pointerChange, 0, IDENTITY_TRANSFORM, packet);
-    if (packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0) {
-      throw new AssertionError("Packet position is not on field boundary.");
+    if (isPointerEvent || isMovementEvent) {
+        int pointerChange = getPointerChangeForAction(event.getActionMasked());
+        ByteBuffer packet =
+            ByteBuffer.allocateDirect(
+                event.getPointerCount() * POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD);
+        packet.order(ByteOrder.LITTLE_ENDIAN);
+
+        // ACTION_HOVER_MOVE always applies to a single pointer only.
+        addPointerForIndex(event, event.getActionIndex(), pointerChange, 0, IDENTITY_TRANSFORM, packet);
+        if (packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0) {
+          throw new AssertionError("Packet position is not on field boundary.");
+        }
+        renderer.dispatchPointerDataPacket(packet, packet.position());
+        return true;
     }
-    renderer.dispatchPointerDataPacket(packet, packet.position());
-    return true;
+    return false;
   }
 
   // TODO(mattcarroll): consider creating a PointerPacket class instead of using a procedure that
@@ -252,6 +260,7 @@ private void addPointerForIndex(
       buttons = 0;
     }
 
+    int panZoomType = -1;
     boolean isTrackpadPan = ongoingPans.containsKey(event.getPointerId(pointerIndex));
 
     int signalKind =
@@ -264,8 +273,14 @@ private void addPointerForIndex(
     packet.putLong(motionEventId); // motionEventId
     packet.putLong(timeStamp); // time_stamp
     if (isTrackpadPan) {
-      packet.putLong(getPointerChangeForPanZoom(pointerChange)); // change
-      packet.putLong(PointerDeviceKind.TRACKPAD); // kind
+      panZoomType = getPointerChangeForPanZoom(pointerChange);
+      if (panZoomType > 0) {
+        packet.putLong(panZoomType); // change
+        packet.putLong(PointerDeviceKind.TRACKPAD); // kind
+      } else {
+            packet.putLong(pointerChange); // change
+            packet.putLong(pointerKind); // kind
+        }
     } else {
       packet.putLong(pointerChange); // change
       packet.putLong(pointerKind); // kind
@@ -274,7 +289,7 @@ private void addPointerForIndex(
     packet.putLong(event.getPointerId(pointerIndex)); // device
     packet.putLong(0); // pointer_identifier, will be generated in pointer_data_packet_converter.cc.
 
-    if (isTrackpadPan) {
+    if (isTrackpadPan && (panZoomType > 0)) {
       float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
       packet.putDouble(panStart[0]);
       packet.putDouble(panStart[1]);
@@ -342,7 +357,7 @@ private void addPointerForIndex(
       packet.putDouble(0.0); // scroll_delta_x
     }
 
-    if (isTrackpadPan) {
+    if (isTrackpadPan && (panZoomType > 0)) {
       float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
       packet.putDouble(viewToScreenCoords[0] - panStart[0]);
       packet.putDouble(viewToScreenCoords[1] - panStart[1]);
@@ -355,7 +370,7 @@ private void addPointerForIndex(
     packet.putDouble(1.0); // scale
     packet.putDouble(0.0); // rotation
 
-    if (isTrackpadPan && getPointerChangeForPanZoom(pointerChange) == PointerChange.PAN_ZOOM_END) {
+    if (isTrackpadPan && (panZoomType == PointerChange.PAN_ZOOM_END)) {
       ongoingPans.remove(event.getPointerId(pointerIndex));
     }
   }
@@ -396,12 +411,12 @@ private int getPointerChangeForAction(int maskedAction) {
   private int getPointerChangeForPanZoom(int pointerChange) {
     if (pointerChange == PointerChange.DOWN) {
       return PointerChange.PAN_ZOOM_START;
-    } else if (pointerChange == PointerChange.MOVE) {
+    } else if (pointerChange == PointerChange.MOVE || pointerChange == PointerChange.HOVER) {
       return PointerChange.PAN_ZOOM_UPDATE;
     } else if (pointerChange == PointerChange.UP || pointerChange == PointerChange.CANCEL) {
       return PointerChange.PAN_ZOOM_END;
     }
-    throw new AssertionError("Unexpected pointer change");
+    return -1;
   }
 
   @PointerDeviceKind

shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java

@@ -218,4 +218,58 @@ public void unexpectedMaskedAction() {
     touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_BUTTON_PRESS, 0.0f, 0.0f, 0));
     verify(mockRenderer, never()).dispatchPointerDataPacket(ByteBuffer.allocate(0), 0);
   }
+
+  @Test
+  public void unexpectedPointerChange() {
+    // Regression test for https://github.com/flutter/flutter/issues/129765
+
+    MotionEventMocker mocker =
+        new MotionEventMocker(0, InputDevice.SOURCE_MOUSE, MotionEvent.TOOL_TYPE_MOUSE);
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_DOWN, 0.0f, 0.0f, 0));
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_START, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_MOVE, 10.0f, 5.0f, 0));
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_UPDATE, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+    assertEquals(10.0, readPointerPanX(packet));
+    assertEquals(5.0, readPointerPanY(packet));
+
+    touchProcessor.onGenericMotionEvent(mocker.mockEvent(MotionEvent.ACTION_SCROLL, 0.0f, 0.0f, 0));
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_UP, 10.0f, 5.0f, 0));
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_END, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+    inOrder.verifyNoMoreInteractions();
+  }
+
 }