summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-09 20:06:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-09 20:06:20 +0000
commitb22ba343e014c617eb76b4ffed5e81d710e76d25 (patch)
tree1c47be3898331d2128cf80baae4d28b1da5d6208
parent887eccc8f2740a95364353e0aa199d5e2b8f31a9 (diff)
parent737274567d3b639186bce997ccf48209a500e1d3 (diff)
Merge "dumpstate: collect snapshotctl logs without root." am: 737274567d
Change-Id: Ib69e154526f1130452af5a98cf13f51f80537da9
-rw-r--r--cmds/dumpstate/dumpstate.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 310b5cecf0..f535605dea 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1437,6 +1437,8 @@ static Dumpstate::RunStatus dumpstate() {
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? */
@@ -1569,7 +1571,6 @@ static Dumpstate::RunStatus DumpstateDefault() {
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);