commit cc87cfa29c4b38d1f119bdce652918565b0fed0f
author Michael Wright <michaelwr@google.com> Wed Jun 10 17:06:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 17:06:16 2015 +0000
tree 9e24a2f3601f71aced5cc3ee0321bd27cba2a083
parent 89124000c618f24b948505cd79f654aacbdff957
parent 7a629cc78eef76c0a80855fb69de1afaceaf553c

Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev

core/jni/android_view_MotionEvent.cpp

diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp
index 1f28643..eb28c4d 100644
--- a/core/jni/android_view_MotionEvent.cpp
+++ b/core/jni/android_view_MotionEvent.cpp
@@ -370,7 +370,7 @@
         env->DeleteLocalRef(pointerCoordsObj);
     }
 
-    event->initialize(deviceId, source, action, flags, edgeFlags, metaState, buttonState, 0,
+    event->initialize(deviceId, source, action, 0, flags, edgeFlags, metaState, buttonState,
             xOffset, yOffset, xPrecision, yPrecision,
             downTimeNanos, eventTimeNanos, pointerCount, pointerProperties, rawPointerCoords);