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

* commit 'cc87cfa29c4b38d1f119bdce652918565b0fed0f':
  Fix order of initialization arguments for obtained MotionEvents.
This commit is contained in:
Michael Wright
2015-06-10 17:20:58 +00:00
committed by Android Git Automerger

View File

@@ -370,7 +370,7 @@ static jlong android_view_MotionEvent_nativeInitialize(JNIEnv* env, jclass clazz
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);