ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7fea2361: Merge "Track Looper decoupling from ALooper"

Browse Source 
* commit '7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
  Track Looper decoupling from ALooper
This commit is contained in:
Brian Carlstrom 2013-12-18 23:21:51 -08:00 committed by Android Git Automerger
commit c1bf6fa949
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/android/looper.h
View File

@ -253,4 +253,4 @@ int ALooper_removeFd(ALooper* looper, int fd);
};
#endif
#endif // ANDROID_NATIVE_WINDOW_H
#endif // ANDROID_LOOPER_H

12
services/surfaceflinger/MessageQueue.cpp
View File

@ -105,7 +105,7 @@ void MessageQueue::setEventThread(const sp<EventThread>& eventThread)
mEventThread = eventThread;
mEvents = eventThread->createEventConnection();
mEventTube = mEvents->getDataChannel();
mLooper->addFd(mEventTube->getFd(), 0, ALOOPER_EVENT_INPUT,
mLooper->addFd(mEventTube->getFd(), 0, Looper::EVENT_INPUT,
MessageQueue::cb_eventReceiver, this);
}
@ -114,12 +114,12 @@ void MessageQueue::waitMessage() {
IPCThreadState::self()->flushCommands();
int32_t ret = mLooper->pollOnce(-1);
switch (ret) {
case ALOOPER_POLL_WAKE:
case ALOOPER_POLL_CALLBACK:
case Looper::POLL_WAKE:
case Looper::POLL_CALLBACK:
continue;
case ALOOPER_POLL_ERROR:
ALOGE("ALOOPER_POLL_ERROR");
case ALOOPER_POLL_TIMEOUT:
case Looper::POLL_ERROR:
ALOGE("Looper::POLL_ERROR");
case Looper::POLL_TIMEOUT:
// timeout (should not happen)
continue;
default: