Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e75d9631 authored by Josh Gao's avatar Josh Gao
Browse files

resolve merge conflicts of 9c65f4f5 to master 

Change-Id: Icc63b82a4852222275c0bbafd84d4f535a0f8f10
parents 00ac89eb 9c65f4f5

cmds/dumpstate/utils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -864,8 +864,8 @@ const char *dump_traces() { 
    }



    /* 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,

    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));