Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix poll options for NativeActivity's hasEvents"

Browse Source
This commit is contained in:
Kenny Root
2011-02-22 16:08:42 -08:00
committed by Android (Google) Code Review
parent 2bbe178fea 2bb10f4299
commit 1665da555d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_app_NativeActivity.cpp
View File

@@ -150,12 +150,12 @@ int32_t AInputQueue::hasEvents() {
pfd[0].events = POLLIN;
pfd[0].revents = 0;
pfd[1].fd = mDispatchKeyRead;
pfd[0].events = POLLIN;
pfd[0].revents = 0;
pfd[1].events = POLLIN;
pfd[1].revents = 0;
int nfd = poll(pfd, 2, 0);
if (nfd <= 0) return 0;
return (pfd[0].revents == POLLIN || pfd[1].revents == POLLIN) ? 1 : -1;
return ((pfd[0].revents & POLLIN) || (pfd[1].revents & POLLIN)) ? 1 : -1;
}
int32_t AInputQueue::getEvent(AInputEvent** outEvent) {