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

Commit 4c6d9c9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't set mFdEvents if looper fd update fails" into main

parents 1d752f55 b510e785

core/jni/android_view_InputEventReceiver.cpp

+9 −3
Original line number Diff line number Diff line
@@ -217,12 +217,18 @@ void NativeInputEventReceiver::setFdEvents(int events) { 
    if (events == mFdEvents) {

        return;

    }

    mFdEvents = events;

    const int fd = mInputConsumer->getChannel()->getFd();

    int res = 0;

    if (events) {

        mMessageQueue->getLooper()->addFd(fd, 0, events, this, nullptr);

        res = mMessageQueue->getLooper()->addFd(fd, 0, events, this, nullptr);

    } else {

        res = mMessageQueue->getLooper()->removeFd(fd);

    }

    if (res != -1) {

        mFdEvents = events;

    } else {

        mMessageQueue->getLooper()->removeFd(fd);

        ALOGE("channel '%s' ~ Failed to %s fd for channel", mName.c_str(),

              events ? "add" : "remove");

    }

}