commit 76f7f29f6887207a2179ba062eb8dfeb4d4e0a40
author Yifan Hong <elsk@google.com> Mon Mar 09 17:04:59 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 17:04:59 2020 +0000
tree c6a9f22b7158954a47f465846adf2b15f3813104
parent 44ecbf8a3c5f1b5b876a77a55df2898c66463f62
parent d90cc65d74b26b7346d4a55704606a54b6956b34

Merge "dumpstate: collect snapshotctl logs without root." into rvc-dev

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 3440116..e7029bd 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1477,6 +1477,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? */
@@ -1605,7 +1607,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);