summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2016-07-19 23:55:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-19 23:55:21 +0000
commitf7eed1ea07e2785e80d2cdce0f905f08fb576ed1 (patch)
tree5d80ed1c84427467e94d4f04836bec12ec0c7017
parent2df182d7b140d5d351ba6f4670f2cc9bc77e1846 (diff)
parent877af59f24fb50fa0f5a3454ba79f382e614cf20 (diff)
downloadlibhardware-f7eed1ea07e2785e80d2cdce0f905f08fb576ed1.tar.gz
Merge "DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls" into cw-e-dev
-rw-r--r--modules/sensors/multihal.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index d1536f48..6536882f 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -155,7 +155,11 @@ void *writerTask(void* ptr) {
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);