commit d4f4edcbdaa5420bdeebf6d469bdc811345ada59
author Gavin Corkery <gavincorkery@google.com> Thu Feb 25 16:51:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 25 16:51:02 2021 +0000
tree 370a27f7dfb716daf35d6831853d8936b1fbd3e9
parent 4fb0f925123397465bfb9b50f7030229e537e1cd
parent 75dbd5e96c2a48412989121771c476e7941a464d

Merge "Store ANR traces in internal directory" am: 75dbd5e96c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1592374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1162f74101233d6916d9157b82c8a4f28d1462d

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 528feca..e377f16 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2060,7 +2060,7 @@
 }
 
 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 @@
     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() {