summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-09-16 22:16:02 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-16 22:16:02 -0700
commit9ebbaec7085d667c8b3eddac335dd7fb33996bc5 (patch)
tree5469f303810b7d4acca9770c9904c8d2f53a7148
parentf5da5e0c6979a32ca828e25b860f116710a20541 (diff)
parent2ffb24799e579c47a73c992ab567f05c4bf0c962 (diff)
am 36f429d3: Fix typo which causes sensors to fail miserably
Merge commit '36f429d300be2550d7459b488dfc05b00ec59312' into gingerbread-plus-aosp * commit '36f429d300be2550d7459b488dfc05b00ec59312': Fix typo which causes sensors to fail miserably
-rw-r--r--libs/gui/SensorEventQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SensorEventQueue.cpp b/libs/gui/SensorEventQueue.cpp
index b0d0f12c6b..f9355249ab 100644
--- a/libs/gui/SensorEventQueue.cpp
+++ b/libs/gui/SensorEventQueue.cpp
@@ -110,7 +110,7 @@ status_t SensorEventQueue::waitForEvent() const
}
} while (result != fd);
- return result;
+ return (result == fd) ? status_t(NO_ERROR) : result;
}
status_t SensorEventQueue::wake() const