commit 3410a85b15a4d2579b5e77144f275a30ad880a65
author Jesse Hall <jessehall@google.com> Fri May 04 17:14:57 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 04 17:14:57 2012 -0700
tree cce519d2ab3c70f21f795df06b132a4fcd875899
parent 23789ae95fd24d15c330bc9cae73975566632f97
parent 201f3b2da572eb27b9d4b3131e6d8c3c92a13de8

Merge "Disable EGL hibernation due to jank" into jb-dev

include/utils/Trace.h

diff --git a/include/utils/Trace.h b/include/utils/Trace.h
index 6e2e284..032af1b 100644
--- a/include/utils/Trace.h
+++ b/include/utils/Trace.h
@@ -48,7 +48,8 @@
 #define ATRACE_TAG_WEBVIEW          (1<<4)
 #define ATRACE_TAG_WINDOW_MANAGER   (1<<5)
 #define ATRACE_TAG_ACTIVITY_MANAGER (1<<6)
-#define ATRACE_TAG_LAST             ATRACE_TAG_ACTIVITY_MANAGER
+#define ATRACE_TAG_SYNC_MANAGER     (1<<7)
+#define ATRACE_TAG_LAST             ATRACE_TAG_SYNC_MANAGER
 
 #define ATRACE_TAG_VALID_MASK ((ATRACE_TAG_LAST - 1) | ATRACE_TAG_LAST)
 

libs/gui/Sensor.cpp

diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index f9a2c04..5cc76b4 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -40,6 +40,7 @@
 {
     mName = hwSensor->name;
     mVendor = hwSensor->vendor;
+    mVersion = hwSensor->version;
     mHandle = hwSensor->handle;
     mType = hwSensor->type;
     mMinValue = 0;                      // FIXME: minValue
@@ -101,7 +102,7 @@
 {
     return  sizeof(int32_t) + ((mName.length() + 3) & ~3) +
             sizeof(int32_t) + ((mVendor.length() + 3) & ~3) +
-            sizeof(int32_t) * 2 +
+            sizeof(int32_t) * 3 +
             sizeof(float) * 4 +
             sizeof(int32_t);
 }
@@ -140,6 +141,7 @@
     offset += write(buffer, offset, mName);
     offset += write(buffer, offset, int32_t(mVendor.length()));
     offset += write(buffer, offset, mVendor);
+    offset += write(buffer, offset, mVersion);
     offset += write(buffer, offset, mHandle);
     offset += write(buffer, offset, mType);
     offset += write(buffer, offset, mMinValue);
@@ -178,6 +180,7 @@
     offset += read(buffer, offset, &mName, len);
     offset += read(buffer, offset, &len);
     offset += read(buffer, offset, &mVendor, len);
+    offset += read(buffer, offset, &mVersion);
     offset += read(buffer, offset, &mHandle);
     offset += read(buffer, offset, &mType);
     offset += read(buffer, offset, &mMinValue);