Revert "Fix unexpected pointer change (#129765)"

This reverts commit b6ac786.

Author: LoveJello

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

@@ -13,12 +13,9 @@
 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,
@@ -112,7 +109,6 @@ public AndroidTouchProcessor(@NonNull FlutterRenderer renderer, boolean trackMot
   }
 
   public boolean onTouchEvent(@NonNull MotionEvent event) {
-    Log.v(TAG, "onTouchEvent, event " + event);
     return onTouchEvent(event, IDENTITY_TRANSFORM);
   }
 
@@ -190,9 +186,6 @@ 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);
@@ -259,7 +252,6 @@ private void addPointerForIndex(
       buttons = 0;
     }
 
-    int panZoomType = -1;
     boolean isTrackpadPan = ongoingPans.containsKey(event.getPointerId(pointerIndex));
 
     int signalKind =
@@ -272,14 +264,8 @@ private void addPointerForIndex(
     packet.putLong(motionEventId); // motionEventId
     packet.putLong(timeStamp); // time_stamp
     if (isTrackpadPan) {
-      panZoomType = getPointerChangeForPanZoom(pointerChange);
-      if (panZoomType > 0) {
-        packet.putLong(panZoomType); // change
-        packet.putLong(PointerDeviceKind.TRACKPAD); // kind
-      } else {
-            packet.putLong(pointerChange); // change
-            packet.putLong(pointerKind); // kind
-        }
+      packet.putLong(getPointerChangeForPanZoom(pointerChange)); // change
+      packet.putLong(PointerDeviceKind.TRACKPAD); // kind
     } else {
       packet.putLong(pointerChange); // change
       packet.putLong(pointerKind); // kind
@@ -288,7 +274,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 && (panZoomType > 0)) {
+    if (isTrackpadPan) {
       float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
       packet.putDouble(panStart[0]);
       packet.putDouble(panStart[1]);
@@ -356,7 +342,7 @@ private void addPointerForIndex(
       packet.putDouble(0.0); // scroll_delta_x
     }
 
-    if (isTrackpadPan && (panZoomType > 0)) {
+    if (isTrackpadPan) {
       float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
       packet.putDouble(viewToScreenCoords[0] - panStart[0]);
       packet.putDouble(viewToScreenCoords[1] - panStart[1]);
@@ -369,7 +355,7 @@ private void addPointerForIndex(
     packet.putDouble(1.0); // scale
     packet.putDouble(0.0); // rotation
 
-    if (isTrackpadPan && (panZoomType == PointerChange.PAN_ZOOM_END)) {
+    if (isTrackpadPan && getPointerChangeForPanZoom(pointerChange) == PointerChange.PAN_ZOOM_END) {
       ongoingPans.remove(event.getPointerId(pointerIndex));
     }
   }
@@ -415,7 +401,7 @@ private int getPointerChangeForPanZoom(int pointerChange) {
     } else if (pointerChange == PointerChange.UP || pointerChange == PointerChange.CANCEL) {
       return PointerChange.PAN_ZOOM_END;
     }
-    return -1;
+    throw new AssertionError("Unexpected pointer change");
   }
 
   @PointerDeviceKind