Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d81558d9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "dumpstate: collect snapshotctl logs without root." into rvc-dev am: 76f7f29f am: 4c0eea82 am: e4d5d3cd

Change-Id: Id4175c6e6b39c33e2debf9bbca448a3993ceb04a
parents c777a9d7 e4d5d3cd
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1477,6 +1477,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? */
@@ -1605,7 +1607,6 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() {
    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);