commit e75d9631b2bfabc97bb3d1fd88668f3383ef5664
author Josh Gao <jmgao@google.com> Wed Jan 18 16:14:03 2017 -0800
committer Josh Gao <jmgao@google.com> Wed Jan 18 16:14:48 2017 -0800
tree 85796c71f83aa469719d42330dec2634d6ed6fa9
parent 00ac89ebc39fd2841f543653f3518009a2fbd9d0
parent 9c65f4f5099d2827b2cc7283077a80d406bbbb06

resolve merge conflicts of 9c65f4f50 to master

Change-Id: Icc63b82a4852222275c0bbafd84d4f535a0f8f10

cmds/dumpstate/utils.cpp

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index 1b8a5e4..c6dfa37 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -864,9 +864,9 @@
     }
 
     /* create a new, empty traces.txt file to receive stack dumps */
-    int fd = TEMP_FAILURE_RETRY(open(traces_path.c_str(),
-                                     O_CREAT | O_WRONLY | O_TRUNC | O_NOFOLLOW | O_CLOEXEC,
-                                     0666)); /* -rw-rw-rw- */
+    int fd = TEMP_FAILURE_RETRY(
+        open(traces_path.c_str(), O_CREAT | O_WRONLY | O_APPEND | O_TRUNC | O_NOFOLLOW | O_CLOEXEC,
+             0666)); /* -rw-rw-rw- */
     if (fd < 0) {
         MYLOGE("%s: %s\n", traces_path.c_str(), strerror(errno));
         return nullptr;