summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-16 15:38:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 15:38:29 +0000
commit7471dfc4a894ade4cd83949d2b59b9b7e75bbf92 (patch)
tree694e7df8a8a45f1fc2df12599f3ffb0327775341 /core/java/android/os
parent077386dbda31bfef96acca3a1ba84fece67e391a (diff)
parent42defa02337b94d25714fe737f749f2c3300c790 (diff)
downloadframeworks_base-7471dfc4a894ade4cd83949d2b59b9b7e75bbf92.zip
frameworks_base-7471dfc4a894ade4cd83949d2b59b9b7e75bbf92.tar.gz
frameworks_base-7471dfc4a894ade4cd83949d2b59b9b7e75bbf92.tar.bz2
am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '42defa02337b94d25714fe737f749f2c3300c790': AArch64: Use long for pointers in android/os/MessageQueue
Diffstat (limited to 'core/java/android/os')
-rw-r--r--core/java/android/os/MessageQueue.java12
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