diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-08 19:10:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-08 19:10:17 -0700 |
| commit | d8a6271bb1da4ee2a8ae126b532f1b5f302decb8 (patch) | |
| tree | 5de91054c0b6d73707104eb6ae30d0c612e94665 /core/jni | |
| parent | 2a57917a5cc10cbfea9a2f7ed7b040ce80c6705b (diff) | |
| parent | 49159f0748c704e53a7bd754f26113d9ab844a97 (diff) | |
| download | frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.zip frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.tar.gz frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.tar.bz2 | |
am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'
* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
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() { |