diff options
| author | 2021-02-25 17:49:13 +0000 | |
|---|---|---|
| committer | 2021-02-25 17:49:13 +0000 | |
| commit | 0fadd9c98c402cd40995f309c15c2325b2d65e04 (patch) | |
| tree | 370a27f7dfb716daf35d6831853d8936b1fbd3e9 | |
| parent | 91d42e487df16e1ff6ca309d28f65d3fc392e1ae (diff) | |
| parent | d4f4edcbdaa5420bdeebf6d469bdc811345ada59 (diff) | |
Merge "Store ANR traces in internal directory" am: 75dbd5e96c am: d4f4edcbda
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1592374
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia46bf00f542c9ddfdbaa65f2a15d5d361d1996a9
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 528feca0cf..e377f1659f 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -2060,7 +2060,7 @@ static void DumpstateWifiOnly() { } Dumpstate::RunStatus Dumpstate::DumpTraces(const char** path) { - const std::string temp_file_pattern = "/data/anr/dumptrace_XXXXXX"; + const std::string temp_file_pattern = ds.bugreport_internal_dir_ + "/dumptrace_XXXXXX"; const size_t buf_size = temp_file_pattern.length() + 1; std::unique_ptr<char[]> file_name_buf(new char[buf_size]); memcpy(file_name_buf.get(), temp_file_pattern.c_str(), buf_size); @@ -3067,6 +3067,9 @@ void Dumpstate::CleanupTmpFiles() { android::os::UnlinkAndLogOnError(tmp_path_); android::os::UnlinkAndLogOnError(screenshot_path_); android::os::UnlinkAndLogOnError(path_); + if (dump_traces_path != nullptr) { + android::os::UnlinkAndLogOnError(dump_traces_path); + } } void Dumpstate::EnableParallelRunIfNeeded() { |