commit 1c45dc66c77f0ddb246a55d780206a183740ff7f
author Andrew Hsieh <andrewhsieh@google.com> Thu May 30 01:30:48 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 30 01:30:48 2013 +0000
tree 3ba0929fdc8ed35488a615ed8413c0d9fcbb4640
parent 74bd799ec20d2420459fa382533b1cc39ca9a54c
parent 26c24162817a1986c2afbff15dbe896b0cbcc01d

Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"

cmds/dumpstate/dumpstate.c

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 55a36c2..dbe9832 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -314,7 +314,13 @@
 		);
 }
 
+static void sigpipe_handler(int n) {
+    (void)n;
+    exit(EXIT_FAILURE);
+}
+
 int main(int argc, char *argv[]) {
+    struct sigaction sigact;
     int do_add_date = 0;
     int do_compress = 0;
     int do_vibrate = 1;
@@ -334,7 +340,9 @@
     }
     ALOGI("begin\n");
 
-    signal(SIGPIPE, SIG_IGN);
+    memset(&sigact, 0, sizeof(sigact));
+    sigact.sa_handler = sigpipe_handler;
+    sigaction(SIGPIPE, &sigact, NULL);
 
     /* set as high priority, and protect from OOM killer */
     setpriority(PRIO_PROCESS, 0, -20);

include/utils/Log.h

diff --git a/include/utils/Log.h b/include/utils/Log.h
index 98c441c..4259c86 100644
--- a/include/utils/Log.h
+++ b/include/utils/Log.h
@@ -62,7 +62,7 @@
  * }
  */
 #define ALOGD_IF_SLOW(timeoutMillis, message) \
-        LogIfSlow _logIfSlow(LOG_TAG, ANDROID_LOG_DEBUG, timeoutMillis, message);
+    android::LogIfSlow _logIfSlow(LOG_TAG, ANDROID_LOG_DEBUG, timeoutMillis, message);
 
 } // namespace android