Merge pull request #44067 from akien-mga/fix_android_wrong_multitouch_pointerid

fix android wrong multi-touch pointerid

1 files changed, 2 insertions, 4 deletions

diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
index f3e985f944..6d5be312f1 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
@@ -181,6 +181,7 @@ public class GodotInputHandler implements InputDeviceListener {
 				arr[i * 3 + 2] = event.getY(i);
 			}
 			final int action = event.getActionMasked();
+			final int pointer_idx = event.getPointerId(event.getActionIndex());
 
 			mRenderView.queueOnRenderThread(new Runnable() {
 				@Override
@@ -189,12 +190,9 @@ public class GodotInputHandler implements InputDeviceListener {
 						case MotionEvent.ACTION_DOWN:
 						case MotionEvent.ACTION_CANCEL:
 						case MotionEvent.ACTION_UP:
-						case MotionEvent.ACTION_MOVE: {
-							GodotLib.touch(event.getSource(), action, 0, evcount, arr);
-						} break;
+						case MotionEvent.ACTION_MOVE:
 						case MotionEvent.ACTION_POINTER_UP:
 						case MotionEvent.ACTION_POINTER_DOWN: {
-							int pointer_idx = event.getPointerId(event.getActionIndex());
 							GodotLib.touch(event.getSource(), action, pointer_idx, evcount, arr);
 						} break;
 					}