summaryrefslogtreecommitdiff
path: root/libs/gui/DisplayEventReceiver.cpp
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2012-01-09 23:24:46 +0000
committer Steve Block <steveblock@google.com> 2012-01-09 23:24:46 +0000
commit2e681c1b097883f5c327d3c1c77692ecab498a35 (patch)
tree7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /libs/gui/DisplayEventReceiver.cpp
parent293fa718102353d7b103f10a7c0f580ba87b3a0f (diff)
parent08289f55eae5c4127091360e862f78d57ae24c15 (diff)
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'libs/gui/DisplayEventReceiver.cpp')
-rw-r--r--libs/gui/DisplayEventReceiver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/DisplayEventReceiver.cpp b/libs/gui/DisplayEventReceiver.cpp
index fee1febb9bb1..3b3ccaaf74c5 100644
--- a/libs/gui/DisplayEventReceiver.cpp
+++ b/libs/gui/DisplayEventReceiver.cpp
@@ -81,7 +81,7 @@ status_t DisplayEventReceiver::requestNextVsync() {
ssize_t DisplayEventReceiver::getEvents(DisplayEventReceiver::Event* events,
size_t count) {
ssize_t size = mDataChannel->read(events, sizeof(events[0])*count);
- LOGE_IF(size<0,
+ ALOGE_IF(size<0,
"DisplayEventReceiver::getEvents error (%s)",
strerror(-size));
if (size >= 0) {