commit 82c53806ada5c314124431ec0a49fa15a6b5f1d6
author Jamie Gennis <jgennis@google.com> Wed May 09 12:52:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 09 12:52:25 2012 -0700
tree f1549a37961dc1f073f04afa2f03c2653e9ffd5a
parent cae7c0b955efba6986d9e1fe5a68e48e7a2f806b
parent 5c1139fea3cc0fd9847a6594d853a458152b2fbc

Merge "SurfaceTexture: improve texture matrix computation" into jb-dev

include/utils/Trace.h

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

libs/gui/BitTube.cpp

diff --git a/libs/gui/BitTube.cpp b/libs/gui/BitTube.cpp
index 355a319..cf44bb9 100644
--- a/libs/gui/BitTube.cpp
+++ b/libs/gui/BitTube.cpp
@@ -140,8 +140,7 @@
         ssize_t size = tube->write(vaddr, objSize);
         if (size < 0) {
             // error occurred
-            numObjects = -size;
-            break;
+            return size;
         } else if (size == 0) {
             // no more space
             break;
@@ -160,8 +159,7 @@
         ssize_t size = tube->read(vaddr, objSize);
         if (size < 0) {
             // error occurred
-            numObjects = -size;
-            break;
+            return size;
         } else if (size == 0) {
             // no more messages
             break;

libs/gui/SensorEventQueue.cpp

diff --git a/libs/gui/SensorEventQueue.cpp b/libs/gui/SensorEventQueue.cpp
index 04ba640..8a1bf41 100644
--- a/libs/gui/SensorEventQueue.cpp
+++ b/libs/gui/SensorEventQueue.cpp
@@ -79,14 +79,21 @@
     const int fd = getFd();
     sp<Looper> looper(getLooper());
 
+    int events;
     int32_t result;
     do {
-        result = looper->pollOnce(-1);
-        if (result == ALOOPER_EVENT_ERROR) {
+        result = looper->pollOnce(-1, NULL, &events, NULL);
+        if (result == ALOOPER_POLL_ERROR) {
             ALOGE("SensorEventQueue::waitForEvent error (errno=%d)", errno);
             result = -EPIPE; // unknown error, so we make up one
             break;
         }
+        if (events & ALOOPER_EVENT_HANGUP) {
+            // the other-side has died
+            ALOGE("SensorEventQueue::waitForEvent error HANGUP");
+            result = -EPIPE; // unknown error, so we make up one
+            break;
+        }
     } while (result != fd);
 
     return  (result == fd) ? status_t(NO_ERROR) : result;

libs/utils/Trace.cpp

diff --git a/libs/utils/Trace.cpp b/libs/utils/Trace.cpp
index f7d8abe..f3ec485 100644
--- a/libs/utils/Trace.cpp
+++ b/libs/utils/Trace.cpp
@@ -39,7 +39,7 @@
             // sEnabledTags remains zero indicating that no tracing can occur
         } else {
             char value[PROPERTY_VALUE_MAX];
-            property_get("atrace.tags.enableflags", value, "0");
+            property_get("debug.atrace.tags.enableflags", value, "0");
             sEnabledTags = (strtoll(value, NULL, 0) & ATRACE_TAG_VALID_MASK)
                     | ATRACE_TAG_ALWAYS;
         }