diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-16 12:11:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-16 12:12:15 +0000 |
| commit | 84ee7930bb0f91f6a19662efa4c3f7c7044be426 (patch) | |
| tree | 44e9b958b98e0383ed39b6aec61ce19561c557f7 /core/java/android/os | |
| parent | 98002dfb60a20caf62d6682659547c042a4a3342 (diff) | |
| parent | 63a37153238d95cf8897939e6d6e8fbc56e9ec7f (diff) | |
| download | frameworks_base-84ee7930bb0f91f6a19662efa4c3f7c7044be426.zip frameworks_base-84ee7930bb0f91f6a19662efa4c3f7c7044be426.tar.gz frameworks_base-84ee7930bb0f91f6a19662efa4c3f7c7044be426.tar.bz2 | |
Merge "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 799de5c..75f9813 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 |