Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afae1463 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use FastJNI for trivial MotionEvent native methods""

parents 9d24cbca 526cf826

core/jni/android_view_MotionEvent.cpp

+31 −31
Original line number Diff line number Diff line
@@ -767,94 +767,94 @@ static const JNINativeMethod gMotionEventMethods[] = { 
    { "nativeAddBatch",

            "(JJ[Landroid/view/MotionEvent$PointerCoords;I)V",

            (void*)android_view_MotionEvent_nativeAddBatch },

    { "!nativeGetDeviceId",

    { "nativeGetDeviceId",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetDeviceId },

    { "!nativeGetSource",

    { "nativeGetSource",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetSource },

    { "!nativeSetSource",

    { "nativeSetSource",

            "(JI)I",

            (void*)android_view_MotionEvent_nativeSetSource },

    { "!nativeGetAction",

    { "nativeGetAction",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetAction },

    { "!nativeSetAction",

    { "nativeSetAction",

            "(JI)V",

            (void*)android_view_MotionEvent_nativeSetAction },

    { "!nativeGetActionButton",

    { "nativeGetActionButton",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetActionButton},

    { "!nativeSetActionButton",

    { "nativeSetActionButton",

            "(JI)V",

            (void*)android_view_MotionEvent_nativeSetActionButton},

    { "!nativeIsTouchEvent",

    { "nativeIsTouchEvent",

            "(J)Z",

            (void*)android_view_MotionEvent_nativeIsTouchEvent },

    { "!nativeGetFlags",

    { "nativeGetFlags",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetFlags },

    { "!nativeSetFlags",

    { "nativeSetFlags",

            "(JI)V",

            (void*)android_view_MotionEvent_nativeSetFlags },

    { "!nativeGetEdgeFlags",

    { "nativeGetEdgeFlags",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetEdgeFlags },

    { "!nativeSetEdgeFlags",

    { "nativeSetEdgeFlags",

            "(JI)V",

            (void*)android_view_MotionEvent_nativeSetEdgeFlags },

    { "!nativeGetMetaState",

    { "nativeGetMetaState",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetMetaState },

    { "!nativeGetButtonState",

    { "nativeGetButtonState",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetButtonState },

    { "!nativeSetButtonState",

    { "nativeSetButtonState",

            "(JI)V",

            (void*)android_view_MotionEvent_nativeSetButtonState },

    { "!nativeOffsetLocation",

    { "nativeOffsetLocation",

            "(JFF)V",

            (void*)android_view_MotionEvent_nativeOffsetLocation },

    { "!nativeGetXOffset",

    { "nativeGetXOffset",

            "(J)F",

            (void*)android_view_MotionEvent_nativeGetXOffset },

    { "!nativeGetYOffset",

    { "nativeGetYOffset",

            "(J)F",

            (void*)android_view_MotionEvent_nativeGetYOffset },

    { "!nativeGetXPrecision",

    { "nativeGetXPrecision",

            "(J)F",

            (void*)android_view_MotionEvent_nativeGetXPrecision },

    { "!nativeGetYPrecision",

    { "nativeGetYPrecision",

            "(J)F",

            (void*)android_view_MotionEvent_nativeGetYPrecision },

    { "!nativeGetDownTimeNanos",

    { "nativeGetDownTimeNanos",

            "(J)J",

            (void*)android_view_MotionEvent_nativeGetDownTimeNanos },

    { "!nativeSetDownTimeNanos",

    { "nativeSetDownTimeNanos",

            "(JJ)V",

            (void*)android_view_MotionEvent_nativeSetDownTimeNanos },

    { "!nativeGetPointerCount",

    { "nativeGetPointerCount",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetPointerCount },

    { "!nativeGetPointerId",

    { "nativeGetPointerId",

            "(JI)I",

            (void*)android_view_MotionEvent_nativeGetPointerId },

    { "!nativeGetToolType",

    { "nativeGetToolType",

            "(JI)I",

            (void*)android_view_MotionEvent_nativeGetToolType },

    { "!nativeFindPointerIndex",

    { "nativeFindPointerIndex",

            "(JI)I",

            (void*)android_view_MotionEvent_nativeFindPointerIndex },

    { "!nativeGetHistorySize",

    { "nativeGetHistorySize",

            "(J)I",

            (void*)android_view_MotionEvent_nativeGetHistorySize },

    { "!nativeGetEventTimeNanos",

    { "nativeGetEventTimeNanos",

            "(JI)J",

            (void*)android_view_MotionEvent_nativeGetEventTimeNanos },

    { "!nativeGetRawAxisValue",

    { "nativeGetRawAxisValue",

            "(JIII)F",

            (void*)android_view_MotionEvent_nativeGetRawAxisValue },

    { "!nativeGetAxisValue",

    { "nativeGetAxisValue",

            "(JIII)F",

            (void*)android_view_MotionEvent_nativeGetAxisValue },

    { "nativeGetPointerCoords",
@@ -863,7 +863,7 @@ static const JNINativeMethod gMotionEventMethods[] = { 
    { "nativeGetPointerProperties",

            "(JILandroid/view/MotionEvent$PointerProperties;)V",

            (void*)android_view_MotionEvent_nativeGetPointerProperties },

    { "!nativeScale",

    { "nativeScale",

            "(JF)V",

            (void*)android_view_MotionEvent_nativeScale },

    { "nativeTransform",