diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:58:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:58:04 +0000 |
| commit | 5875c94c591e3e10011509cd6a059844316b7f85 (patch) | |
| tree | 40cec140666f8f14c4c8f1e6cbf7e632551eaa85 /core/java/android/os | |
| parent | 4d7f9450663468abf5e41e24b7d3b1d5c3ea6143 (diff) | |
| parent | 275586aa53889a851e0b739e408896861d76e3a8 (diff) | |
| download | frameworks_base-5875c94c591e3e10011509cd6a059844316b7f85.zip frameworks_base-5875c94c591e3e10011509cd6a059844316b7f85.tar.gz frameworks_base-5875c94c591e3e10011509cd6a059844316b7f85.tar.bz2 | |
am 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '275586aa53889a851e0b739e408896861d76e3a8':
AArch64: Use long for pointers in android/os/MessageQueue
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/MessageQueue.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index e90a457..931afc1 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -35,7 +35,7 @@ public final class MessageQueue { private final boolean mQuitAllowed; @SuppressWarnings("unused") - private int mPtr; // used by native code + private long mPtr; // used by native code Message mMessages; private final ArrayList<IdleHandler> mIdleHandlers = new ArrayList<IdleHandler>(); @@ -49,11 +49,11 @@ public final class MessageQueue { // Barriers are indicated by messages with a null target whose arg1 field carries the token. private int mNextBarrierToken; - private native static int nativeInit(); - private native static void nativeDestroy(int ptr); - private native static void nativePollOnce(int ptr, int timeoutMillis); - private native static void nativeWake(int ptr); - private native static boolean nativeIsIdling(int ptr); + private native static long nativeInit(); + private native static void nativeDestroy(long ptr); + private native static void nativePollOnce(long ptr, int timeoutMillis); + private native static void nativeWake(long ptr); + private native static boolean nativeIsIdling(long ptr); /** * Callback interface for discovering when a thread is going to block |