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

Commit 5302ea98 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "use epoll_create1" am: 3bd9bfa9 am: 225ae4d0 

am: 2269e3fc

Change-Id: Id2ffd714a330ec526a896783beafff71aec4710f
parents 76dfac18 2269e3fc

libs/binder/tests/binderLibTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ int run_server(int index, int readypipefd, bool usePoll) 
        }

        IPCThreadState::self()->flushCommands(); // flush BC_ENTER_LOOPER



        epoll_fd = epoll_create1(0);

        epoll_fd = epoll_create1(EPOLL_CLOEXEC);

        if (epoll_fd == -1) {

            return 1;

        }

libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class EpollFileDescriptor { 
      return -EALREADY;

    }



    fd_.reset(epoll_create(64));

    fd_.reset(epoll_create1(EPOLL_CLOEXEC));



    if (fd_.get() < 0)

      return -errno;

libs/vr/libvrflinger/epoll_event_dispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ namespace android { 
namespace dvr {



EpollEventDispatcher::EpollEventDispatcher() {

  epoll_fd_.Reset(epoll_create(64));

  epoll_fd_.Reset(epoll_create1(EPOLL_CLOEXEC));

  if (!epoll_fd_) {

    ALOGE("Failed to create epoll fd: %s", strerror(errno));

    return;

services/inputflinger/EventHub.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ EventHub::EventHub(void) : 
        mPendingEventCount(0), mPendingEventIndex(0), mPendingINotify(false) {

    acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);



    mEpollFd = epoll_create(EPOLL_SIZE_HINT);

    mEpollFd = epoll_create1(EPOLL_CLOEXEC);

    LOG_ALWAYS_FATAL_IF(mEpollFd < 0, "Could not create epoll instance.  errno=%d", errno);



    mINotifyFd = inotify_init();