Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fea2361 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Track Looper decoupling from ALooper"

parents c02c35fb fe761ab6

include/android/looper.h

+1 −1
Original line number Diff line number Diff line
@@ -253,4 +253,4 @@ int ALooper_removeFd(ALooper* looper, int fd); 
};

#endif



#endif // ANDROID_NATIVE_WINDOW_H
 
#endif // ANDROID_LOOPER_H

services/surfaceflinger/MessageQueue.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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: