commit e0e09d47718843c75c182b3ad18d1360daef2dac
author Jeff Brown <jeffbrown@google.com> Fri Sep 17 13:25:55 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 17 13:25:55 2010 -0700
tree f2d8a0e20e6ff176e51c8926cec6c662d7d1cc73
parent 14811c08dfbfc1a3e095e9f5977286f7fc27e0b5
parent b0619e8ad8e258f3e87a78a3a23c353d98efafa7

Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread

libs/gui/SensorEventQueue.cpp

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 @@
         }
     } while (result != fd);
 
-    return result;
+    return  (result == fd) ? status_t(NO_ERROR) : result;
 }
 
 status_t SensorEventQueue::wake() const

libs/ui/GraphicLog.cpp

diff --git a/libs/ui/GraphicLog.cpp b/libs/ui/GraphicLog.cpp
index b55ce23..7ba2779 100644
--- a/libs/ui/GraphicLog.cpp
+++ b/libs/ui/GraphicLog.cpp
@@ -30,7 +30,11 @@
 
 static inline
 void writeInt32(uint8_t* base, size_t& pos, int32_t value) {
+#ifdef HAVE_LITTLE_ENDIAN
+    int32_t v = value;
+#else
     int32_t v = htole32(value);
+#endif
     base[pos] = EVENT_TYPE_INT;
     memcpy(&base[pos+1], &v, sizeof(int32_t));
     pos += 1+sizeof(int32_t);
@@ -38,7 +42,11 @@
 
 static inline
 void writeInt64(uint8_t* base,  size_t& pos, int64_t value) {
+#ifdef HAVE_LITTLE_ENDIAN
+    int64_t v = value;
+#else
     int64_t v = htole64(value);
+#endif
     base[pos] = EVENT_TYPE_LONG;
     memcpy(&base[pos+1], &v, sizeof(int64_t));
     pos += 1+sizeof(int64_t);