commit 64ec2acd656c84f42ecd57648b8c4bc871640563
author Nick Kralevich <nnk@google.com> Mon Dec 17 12:23:38 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 17 12:23:38 2018 -0800
tree 15bff0008576ad604d9e0f0e692009998dda7878
parent b270054220929fd17be072769f0e080784efa9d0
parent 8343cb07226a22fbcafb687f20985b7d9029e3be

Merge "healthd_common.cpp: use epoll_create1" am: 1eebae4517
am: 8343cb0722

Change-Id: I2e5c4ec37f89fbcf309c049c09dbe8e16098f8d2

health/2.0/default/healthd_common.cpp

diff --git a/health/2.0/default/healthd_common.cpp b/health/2.0/default/healthd_common.cpp
index 8ff409d..b5fdc8e 100644
--- a/health/2.0/default/healthd_common.cpp
+++ b/health/2.0/default/healthd_common.cpp
@@ -67,8 +67,6 @@
 
 #define POWER_SUPPLY_SUBSYSTEM "power_supply"
 
-// epoll_create() parameter is actually unused
-#define MAX_EPOLL_EVENTS 40
 static int uevent_fd;
 static int wakealarm_fd;
 
@@ -240,9 +238,9 @@
 }
 
 static int healthd_init() {
-    epollfd = epoll_create(MAX_EPOLL_EVENTS);
+    epollfd = epoll_create1(EPOLL_CLOEXEC);
     if (epollfd == -1) {
-        KLOG_ERROR(LOG_TAG, "epoll_create failed; errno=%d\n", errno);
+        KLOG_ERROR(LOG_TAG, "epoll_create1 failed; errno=%d\n", errno);
         return -1;
     }