commit 9d17b9456729d16bd34c868e6f660b022816d579
author Nandana Dutt <nandana@google.com> Thu Mar 26 10:02:59 2020 +0000
committer Nandana Dutt <nandana@google.com> Thu Mar 26 10:11:28 2020 +0000
tree 9bd5f67d61e20f5e3c0f9b13b038180d44c79a71
parent f835e028b3acb1838b4798a356073d07e76dfd9c

Rename tmp files

Bugreport handling apps know how to filter out .tmp files but not
*.tmp.[ext] files. Fix by moving tmp to the end.

Fixes: 148863019
Test: take bugreport, check /bugreports to verify all tmp files have
.tmp suffix
Test: atest dumpstate_test

Change-Id: I559cef85e5ff5f8a463038b4e4ebfd48063bb39f

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index ec2b922..01b7e63 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2171,7 +2171,7 @@
     }
 
     if (ds.options_->do_screenshot) {
-        ds.screenshot_path_ = ds.GetPath(ds.CalledByApi() ? "-tmp.png" : ".png");
+        ds.screenshot_path_ = ds.GetPath(ds.CalledByApi() ? "-png.tmp" : ".png");
     }
     ds.tmp_path_ = ds.GetPath(".tmp");
     ds.log_path_ = ds.GetPath("-dumpstate_log-" + std::to_string(ds.pid_) + ".txt");
@@ -2190,7 +2190,7 @@
         ds.tmp_path_.c_str(), ds.screenshot_path_.c_str());
 
     if (ds.options_->do_zip_file) {
-        ds.path_ = ds.GetPath(ds.CalledByApi() ? "-tmp.zip" : ".zip");
+        ds.path_ = ds.GetPath(ds.CalledByApi() ? "-zip.tmp" : ".zip");
         MYLOGD("Creating initial .zip file (%s)\n", ds.path_.c_str());
         create_parent_dirs(ds.path_.c_str());
         ds.zip_file.reset(fopen(ds.path_.c_str(), "wb"));