diff options
author | Ashok Bhat <ashok.bhat@arm.com> | 2014-01-08 14:04:51 +0000 |
---|---|---|
committer | David Butcher <david.butcher@arm.com> | 2014-01-09 15:12:04 +0000 |
commit | a931d5218cfee89c7629ffa6cde324fa966449f9 (patch) | |
tree | b8838e043cf755abd2b90acfbad68f55f68f67fe /core/java/android | |
parent | 76d5cdd820b5d81af8de73180c272d7f8a01caae (diff) | |
download | frameworks_base-a931d5218cfee89c7629ffa6cde324fa966449f9.zip frameworks_base-a931d5218cfee89c7629ffa6cde324fa966449f9.tar.gz frameworks_base-a931d5218cfee89c7629ffa6cde324fa966449f9.tar.bz2 |
AArch64: Use long for pointers in view/input classes
For storing pointers, long is used in view/input classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Iafda9f4653c023bcba95b873637d935d0b569f5d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/view/InputChannel.java | 2 | ||||
-rw-r--r-- | core/java/android/view/InputEventReceiver.java | 10 | ||||
-rw-r--r-- | core/java/android/view/InputEventSender.java | 10 | ||||
-rw-r--r-- | core/java/android/view/InputQueue.java | 22 |
4 files changed, 22 insertions, 22 deletions
diff --git a/core/java/android/view/InputChannel.java b/core/java/android/view/InputChannel.java index 40ee1ad..de195ae 100644 --- a/core/java/android/view/InputChannel.java +++ b/core/java/android/view/InputChannel.java @@ -46,7 +46,7 @@ public final class InputChannel implements Parcelable { }; @SuppressWarnings("unused") - private int mPtr; // used by native code + private long mPtr; // used by native code private static native InputChannel[] nativeOpenInputChannelPair(String name); diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index 25972e7..91ef50d 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -34,7 +34,7 @@ public abstract class InputEventReceiver { private final CloseGuard mCloseGuard = CloseGuard.get(); - private int mReceiverPtr; + private long mReceiverPtr; // We keep references to the input channel and message queue objects here so that // they are not GC'd while the native peer of the receiver is using them. @@ -44,11 +44,11 @@ public abstract class InputEventReceiver { // Map from InputEvent sequence numbers to dispatcher sequence numbers. private final SparseIntArray mSeqMap = new SparseIntArray(); - private static native int nativeInit(WeakReference<InputEventReceiver> receiver, + private static native long nativeInit(WeakReference<InputEventReceiver> receiver, InputChannel inputChannel, MessageQueue messageQueue); - private static native void nativeDispose(int receiverPtr); - private static native void nativeFinishInputEvent(int receiverPtr, int seq, boolean handled); - private static native boolean nativeConsumeBatchedInputEvents(int receiverPtr, + private static native void nativeDispose(long receiverPtr); + private static native void nativeFinishInputEvent(long receiverPtr, int seq, boolean handled); + private static native boolean nativeConsumeBatchedInputEvents(long receiverPtr, long frameTimeNanos); /** diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java index be6a623..304ea3f 100644 --- a/core/java/android/view/InputEventSender.java +++ b/core/java/android/view/InputEventSender.java @@ -33,18 +33,18 @@ public abstract class InputEventSender { private final CloseGuard mCloseGuard = CloseGuard.get(); - private int mSenderPtr; + private long mSenderPtr; // We keep references to the input channel and message queue objects here so that // they are not GC'd while the native peer of the receiver is using them. private InputChannel mInputChannel; private MessageQueue mMessageQueue; - private static native int nativeInit(WeakReference<InputEventSender> sender, + private static native long nativeInit(WeakReference<InputEventSender> sender, InputChannel inputChannel, MessageQueue messageQueue); - private static native void nativeDispose(int senderPtr); - private static native boolean nativeSendKeyEvent(int senderPtr, int seq, KeyEvent event); - private static native boolean nativeSendMotionEvent(int senderPtr, int seq, MotionEvent event); + private static native void nativeDispose(long senderPtr); + private static native boolean nativeSendKeyEvent(long senderPtr, int seq, KeyEvent event); + private static native boolean nativeSendMotionEvent(long senderPtr, int seq, MotionEvent event); /** * Creates an input event sender bound to the specified input channel. diff --git a/core/java/android/view/InputQueue.java b/core/java/android/view/InputQueue.java index e3de89d..d5cec49 100644 --- a/core/java/android/view/InputQueue.java +++ b/core/java/android/view/InputQueue.java @@ -23,7 +23,7 @@ import android.os.Looper; import android.os.MessageQueue; import android.util.Pools.Pool; import android.util.Pools.SimplePool; -import android.util.SparseArray; +import android.util.LongSparseArray; import java.lang.ref.WeakReference; @@ -32,20 +32,20 @@ import java.lang.ref.WeakReference; * input events. Currently only usable from native code. */ public final class InputQueue { - private final SparseArray<ActiveInputEvent> mActiveEventArray = - new SparseArray<ActiveInputEvent>(20); + private final LongSparseArray<ActiveInputEvent> mActiveEventArray = + new LongSparseArray<ActiveInputEvent>(20); private final Pool<ActiveInputEvent> mActiveInputEventPool = new SimplePool<ActiveInputEvent>(20); private final CloseGuard mCloseGuard = CloseGuard.get(); - private int mPtr; + private long mPtr; - private static native int nativeInit(WeakReference<InputQueue> weakQueue, + private static native long nativeInit(WeakReference<InputQueue> weakQueue, MessageQueue messageQueue); - private static native int nativeSendKeyEvent(int ptr, KeyEvent e, boolean preDispatch); - private static native int nativeSendMotionEvent(int ptr, MotionEvent e); - private static native void nativeDispose(int ptr); + private static native long nativeSendKeyEvent(long ptr, KeyEvent e, boolean preDispatch); + private static native long nativeSendMotionEvent(long ptr, MotionEvent e); + private static native void nativeDispose(long ptr); /** @hide */ public InputQueue() { @@ -84,7 +84,7 @@ public final class InputQueue { } /** @hide */ - public int getNativePtr() { + public long getNativePtr() { return mPtr; } @@ -92,7 +92,7 @@ public final class InputQueue { public void sendInputEvent(InputEvent e, Object token, boolean predispatch, FinishedInputEventCallback callback) { ActiveInputEvent event = obtainActiveInputEvent(token, callback); - int id; + long id; if (e instanceof KeyEvent) { id = nativeSendKeyEvent(mPtr, (KeyEvent) e, predispatch); } else { @@ -101,7 +101,7 @@ public final class InputQueue { mActiveEventArray.put(id, event); } - private void finishInputEvent(int id, boolean handled) { + private void finishInputEvent(long id, boolean handled) { int index = mActiveEventArray.indexOfKey(id); if (index >= 0) { ActiveInputEvent e = mActiveEventArray.valueAt(index); |