summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2015-03-11 16:47:15 -0700
committerGreg Hackmann <ghackmann@google.com>2015-03-11 16:54:37 -0700
commitd5e97f93f0aee11952b08d1083623f4e63a36b72 (patch)
treeb48bb3efb8504f4be94013e4d8181cdd408d461a /core/jni
parent871e96ab8bad8441a737d225ce652cc4a83b5333 (diff)
downloadframeworks_base-d5e97f93f0aee11952b08d1083623f4e63a36b72.zip
frameworks_base-d5e97f93f0aee11952b08d1083623f4e63a36b72.tar.gz
frameworks_base-d5e97f93f0aee11952b08d1083623f4e63a36b72.tar.bz2
Fix 64-bit MessageQueue JNI build
Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6 Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_os_MessageQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp
index 854e6b7..6e5e67c 100644
--- a/core/jni/android_os_MessageQueue.cpp
+++ b/core/jni/android_os_MessageQueue.cpp
@@ -149,7 +149,7 @@ int NativeMessageQueue::handleEvent(int fd, int looperEvents, void* data) {
if (looperEvents & (Looper::EVENT_ERROR | Looper::EVENT_HANGUP | Looper::EVENT_INVALID)) {
events |= CALLBACK_EVENT_ERROR;
}
- int oldWatchedEvents = reinterpret_cast<int>(data);
+ int oldWatchedEvents = reinterpret_cast<intptr_t>(data);
int newWatchedEvents = mPollEnv->CallIntMethod(mPollObj,
gMessageQueueClassInfo.dispatchEvents, fd, events);
if (!newWatchedEvents) {