commit d90cc65d74b26b7346d4a55704606a54b6956b34
author Yifan Hong <elsk@google.com> Sat Feb 08 16:52:02 2020 -0800
committer Yifan Hong <elsk@google.com> Fri Mar 06 17:21:12 2020 -0800
tree 6574f9aee50e3761bb6bfef03ae9f17e54ab78e1
parent 57cabaca38fd527acdec5fb92c7c5189214ba2b1

dumpstate: collect snapshotctl logs without root.

Test: bugreport
Bug: 148818798
Change-Id: I83e394420225bd9543e013e8ed71b37850d07314
Merged-In: I83e394420225bd9543e013e8ed71b37850d07314

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 814a4ed..e0ed9fe 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1459,6 +1459,8 @@
         ds.AddDir(WMTRACE_DATA_DIR, false);
     }
 
+    ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);
+
     RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(ds.DumpstateBoard);
 
     /* Migrate the ril_dumpstate to a device specific dumpstate? */
@@ -1587,7 +1589,6 @@
     ds.AddDir(RECOVERY_DATA_DIR, true);
     ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);
     ds.AddDir(LOGPERSIST_DATA_DIR, false);
-    ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);
     if (!PropertiesHelper::IsUserBuild()) {
         ds.AddDir(PROFILE_DATA_DIR_CUR, true);
         ds.AddDir(PROFILE_DATA_DIR_REF, true);