commit f7eed1ea07e2785e80d2cdce0f905f08fb576ed1
author Nick Vaccaro <nvaccaro@google.com> Tue Jul 19 23:55:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 23:55:21 2016 +0000
tree 5d80ed1c84427467e94d4f04836bec12ec0c7017
parent 2df182d7b140d5d351ba6f4670f2cc9bc77e1846
parent 877af59f24fb50fa0f5a3454ba79f382e614cf20

Merge "DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls" into cw-e-dev

modules/sensors/multihal.cpp

diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index d1536f4..6536882 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -155,7 +155,11 @@
         ALOGV("writerTask before poll() - bufferSize = %d", bufferSize);
         eventsPolled = device->poll(device, buffer, bufferSize);
         ALOGV("writerTask poll() got %d events.", eventsPolled);
-        if (eventsPolled == 0) {
+        if (eventsPolled <= 0) {
+            if (eventsPolled < 0) {
+                ALOGV("writerTask ignored error %d from %s", eventsPolled, device->common.module->name);
+                ALOGE("ERROR: Fix %s so it does not return error from poll()", device->common.module->name);
+            }
             continue;
         }
         pthread_mutex_lock(&queue_mutex);