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

Commit 2d0e948f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Hold wakelock while handling device add/remove 

EventHub is using epoll (with inotify) to monitor for input devices
being added or removed. This is done by setting a watch on the directory
/dev/input. After the device is added or removed, epoll_wait would
return, and the code would proceed to handle the event.

To ensure that the system is awake the entire time an input device is
being added or removed, use EPOLLWAKEUP for the inotify fd.

Bug: 141532209
Test: none
Change-Id: Ie23ef459bdecdf1df929c34781165e63cae313bf
parent 685e1781

services/inputflinger/reader/EventHub.cpp

+2 −3
Original line number Diff line number Diff line
@@ -271,9 +271,8 @@ EventHub::EventHub(void) 
        ALOGI("Video device scanning disabled");

    }



    struct epoll_event eventItem;

    memset(&eventItem, 0, sizeof(eventItem));

    eventItem.events = EPOLLIN;

    struct epoll_event eventItem = {};

    eventItem.events = EPOLLIN | EPOLLWAKEUP;

    eventItem.data.fd = mINotifyFd;

    int result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mINotifyFd, &eventItem);

    LOG_ALWAYS_FATAL_IF(result != 0, "Could not add INotify to epoll instance.  errno=%d", errno);