commit 7dc75eef42aa50552bac362c37f233a6aff2256f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 23 18:12:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 23 18:12:09 2016 +0000
tree c89fc5aed60ed7894c341a7aeffe148130cf855d
parent fb50c24b04fcc31b5151f884073206ebad59c0cf
parent 0eedb07fb299f18e3ef107d5099c785beea27756

Merge "Make wake() error fatal"

libutils/Looper.cpp

diff --git a/libutils/Looper.cpp b/libutils/Looper.cpp
index 952c992..254cd8d 100644
--- a/libutils/Looper.cpp
+++ b/libutils/Looper.cpp
@@ -84,6 +84,7 @@
 
 Looper::~Looper() {
     close(mWakeEventFd);
+    mWakeEventFd = -1;
     if (mEpollFd >= 0) {
         close(mEpollFd);
     }
@@ -413,7 +414,8 @@
     ssize_t nWrite = TEMP_FAILURE_RETRY(write(mWakeEventFd, &inc, sizeof(uint64_t)));
     if (nWrite != sizeof(uint64_t)) {
         if (errno != EAGAIN) {
-            ALOGW("Could not write wake signal: %s", strerror(errno));
+            LOG_ALWAYS_FATAL("Could not write wake signal to fd %d: %s",
+                    mWakeEventFd, strerror(errno));
         }
     }
 }