summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-09-16 22:16:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 22:16:02 -0700
commit876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1 (patch)
tree660375b023d9704aa52c788fb327a8c3cee2f2ee /libs
parenteb3b40af974d818cab66bf0a728c8bdec4f6f715 (diff)
parent36f429d300be2550d7459b488dfc05b00ec59312 (diff)
downloadframeworks_base-876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1.zip
frameworks_base-876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1.tar.gz
frameworks_base-876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1.tar.bz2
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
Diffstat (limited to 'libs')
-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 b0d0f12..f935524 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