diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-08 12:26:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-08 12:26:32 -0700 |
| commit | 49159f0748c704e53a7bd754f26113d9ab844a97 (patch) | |
| tree | a2a55b66f2ebb9b5c3bda1676e48a2a6679fef4a /core/jni | |
| parent | 49ff1e6c6c857e1a596fa0b75faaaf17cae08621 (diff) | |
| parent | 74bf59b450daf9e7e6bf234f01db164099edbfd5 (diff) | |
| download | frameworks_base-49159f0748c704e53a7bd754f26113d9ab844a97.zip frameworks_base-49159f0748c704e53a7bd754f26113d9ab844a97.tar.gz frameworks_base-49159f0748c704e53a7bd754f26113d9ab844a97.tar.bz2 | |
am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp
* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
Add new glue code for writing native apps.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_os_MessageQueue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp index 961f806..847b5a5 100644 --- a/core/jni/android_os_MessageQueue.cpp +++ b/core/jni/android_os_MessageQueue.cpp @@ -53,7 +53,7 @@ private: NativeMessageQueue::NativeMessageQueue() { mPollLoop = PollLoop::getForThread(); if (mPollLoop == NULL) { - mPollLoop = new PollLoop(); + mPollLoop = new PollLoop(false); PollLoop::setForThread(mPollLoop); } } @@ -62,7 +62,7 @@ NativeMessageQueue::~NativeMessageQueue() { } bool NativeMessageQueue::pollOnce(int timeoutMillis) { - return mPollLoop->pollOnce(timeoutMillis); + return mPollLoop->pollOnce(timeoutMillis) != PollLoop::POLL_TIMEOUT; } void NativeMessageQueue::wake() { |