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

Commit 99a1ef2b authored by Ashok Bhat's avatar Ashok Bhat Committed by David Butcher
Browse files

AArch64: Use long for pointers in MotionEvent class 



For storing pointers, long is used in MotionEvent class,
as native pointers can be 64-bit.

Change-Id: I88ebfef26070b7f49c14945cad37aa3db209ec90
Signed-off-by: default avatarAshok Bhat <ashok.bhat@arm.com>
Signed-off-by: default avatarCraig Barber <craig.barber@arm.com>
Signed-off-by: default avatarKévin PETIT <kevin.petit@arm.com>
parent 9607d78f

core/java/android/view/MotionEvent.java

+40 −40
Original line number Diff line number Diff line
@@ -1311,63 +1311,63 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
    }



    // Pointer to the native MotionEvent object that contains the actual data.

    private int mNativePtr;

    private long mNativePtr;



    private MotionEvent mNext;



    private static native int nativeInitialize(int nativePtr,

    private static native long nativeInitialize(long nativePtr,

            int deviceId, int source, int action, int flags, int edgeFlags,

            int metaState, int buttonState,

            float xOffset, float yOffset, float xPrecision, float yPrecision,

            long downTimeNanos, long eventTimeNanos,

            int pointerCount, PointerProperties[] pointerIds, PointerCoords[] pointerCoords);

    private static native int nativeCopy(int destNativePtr, int sourceNativePtr,

    private static native long nativeCopy(long destNativePtr, long sourceNativePtr,

            boolean keepHistory);

    private static native void nativeDispose(int nativePtr);

    private static native void nativeAddBatch(int nativePtr, long eventTimeNanos,

    private static native void nativeDispose(long nativePtr);

    private static native void nativeAddBatch(long nativePtr, long eventTimeNanos,

            PointerCoords[] pointerCoords, int metaState);



    private static native int nativeGetDeviceId(int nativePtr);

    private static native int nativeGetSource(int nativePtr);

    private static native int nativeSetSource(int nativePtr, int source);

    private static native int nativeGetAction(int nativePtr);

    private static native void nativeSetAction(int nativePtr, int action);

    private static native boolean nativeIsTouchEvent(int nativePtr);

    private static native int nativeGetFlags(int nativePtr);

    private static native void nativeSetFlags(int nativePtr, int flags);

    private static native int nativeGetEdgeFlags(int nativePtr);

    private static native void nativeSetEdgeFlags(int nativePtr, int action);

    private static native int nativeGetMetaState(int nativePtr);

    private static native int nativeGetButtonState(int nativePtr);

    private static native void nativeOffsetLocation(int nativePtr, float deltaX, float deltaY);

    private static native float nativeGetXOffset(int nativePtr);

    private static native float nativeGetYOffset(int nativePtr);

    private static native float nativeGetXPrecision(int nativePtr);

    private static native float nativeGetYPrecision(int nativePtr);

    private static native long nativeGetDownTimeNanos(int nativePtr);

    private static native void nativeSetDownTimeNanos(int nativePtr, long downTime);



    private static native int nativeGetPointerCount(int nativePtr);

    private static native int nativeGetPointerId(int nativePtr, int pointerIndex);

    private static native int nativeGetToolType(int nativePtr, int pointerIndex);

    private static native int nativeFindPointerIndex(int nativePtr, int pointerId);



    private static native int nativeGetHistorySize(int nativePtr);

    private static native long nativeGetEventTimeNanos(int nativePtr, int historyPos);

    private static native float nativeGetRawAxisValue(int nativePtr,

    private static native int nativeGetDeviceId(long nativePtr);

    private static native int nativeGetSource(long nativePtr);

    private static native int nativeSetSource(long nativePtr, int source);

    private static native int nativeGetAction(long nativePtr);

    private static native void nativeSetAction(long nativePtr, int action);

    private static native boolean nativeIsTouchEvent(long nativePtr);

    private static native int nativeGetFlags(long nativePtr);

    private static native void nativeSetFlags(long nativePtr, int flags);

    private static native int nativeGetEdgeFlags(long nativePtr);

    private static native void nativeSetEdgeFlags(long nativePtr, int action);

    private static native int nativeGetMetaState(long nativePtr);

    private static native int nativeGetButtonState(long nativePtr);

    private static native void nativeOffsetLocation(long nativePtr, float deltaX, float deltaY);

    private static native float nativeGetXOffset(long nativePtr);

    private static native float nativeGetYOffset(long nativePtr);

    private static native float nativeGetXPrecision(long nativePtr);

    private static native float nativeGetYPrecision(long nativePtr);

    private static native long nativeGetDownTimeNanos(long nativePtr);

    private static native void nativeSetDownTimeNanos(long nativePtr, long downTime);



    private static native int nativeGetPointerCount(long nativePtr);

    private static native int nativeGetPointerId(long nativePtr, int pointerIndex);

    private static native int nativeGetToolType(long nativePtr, int pointerIndex);

    private static native int nativeFindPointerIndex(long nativePtr, int pointerId);



    private static native int nativeGetHistorySize(long nativePtr);

    private static native long nativeGetEventTimeNanos(long nativePtr, int historyPos);

    private static native float nativeGetRawAxisValue(long nativePtr,

            int axis, int pointerIndex, int historyPos);

    private static native float nativeGetAxisValue(int nativePtr,

    private static native float nativeGetAxisValue(long nativePtr,

            int axis, int pointerIndex, int historyPos);

    private static native void nativeGetPointerCoords(int nativePtr,

    private static native void nativeGetPointerCoords(long nativePtr,

            int pointerIndex, int historyPos, PointerCoords outPointerCoords);

    private static native void nativeGetPointerProperties(int nativePtr,

    private static native void nativeGetPointerProperties(long nativePtr,

            int pointerIndex, PointerProperties outPointerProperties);



    private static native void nativeScale(int nativePtr, float scale);

    private static native void nativeTransform(int nativePtr, Matrix matrix);

    private static native void nativeScale(long nativePtr, float scale);

    private static native void nativeTransform(long nativePtr, Matrix matrix);



    private static native int nativeReadFromParcel(int nativePtr, Parcel parcel);

    private static native void nativeWriteToParcel(int nativePtr, Parcel parcel);

    private static native long nativeReadFromParcel(long nativePtr, Parcel parcel);

    private static native void nativeWriteToParcel(long nativePtr, Parcel parcel);



    private MotionEvent() {

    }

core/jni/android_view_MotionEvent.cpp

+85 −85

File changed.

Preview size limit exceeded, changes collapsed.