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

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

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

Change-Id: I000a45831918996919ee307e66c6e5e6aeb2dde5
parents 2fe0e534 76f7f29f

cmds/dumpstate/dumpstate.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -1477,6 +1477,8 @@ static Dumpstate::RunStatus dumpstate() { 
        ds.AddDir(WMTRACE_DATA_DIR, false);

        ds.AddDir(WMTRACE_DATA_DIR, false);

    }

    }





    ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);



    RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(ds.DumpstateBoard);

    RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(ds.DumpstateBoard);





    /* Migrate the ril_dumpstate to a device specific dumpstate? */

    /* 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(RECOVERY_DATA_DIR, true);

    ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);

    ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);

    ds.AddDir(LOGPERSIST_DATA_DIR, false);

    ds.AddDir(LOGPERSIST_DATA_DIR, false);

    ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);

    if (!PropertiesHelper::IsUserBuild()) {

    if (!PropertiesHelper::IsUserBuild()) {

        ds.AddDir(PROFILE_DATA_DIR_CUR, true);

        ds.AddDir(PROFILE_DATA_DIR_CUR, true);

        ds.AddDir(PROFILE_DATA_DIR_REF, true);

        ds.AddDir(PROFILE_DATA_DIR_REF, true);