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

Commit 0be3db47 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge \"Attach profiles to bug reports\" into nyc-mr1-dev 

am: 4d6b7221

Change-Id: Ic239723d7a5c63047538c56d93e30e1e9d2d8450
parents 25a514b1 4d6b7221

cmds/dumpstate/dumpstate.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,8 @@ static std::string suffix; 
#define RECOVERY_DIR "/cache/recovery"

#define RECOVERY_DIR "/cache/recovery"

#define RECOVERY_DATA_DIR "/data/misc/recovery"

#define RECOVERY_DATA_DIR "/data/misc/recovery"

#define LOGPERSIST_DATA_DIR "/data/misc/logd"

#define LOGPERSIST_DATA_DIR "/data/misc/logd"

#define PROFILE_DATA_DIR_CUR "/data/misc/profiles/cur"

#define PROFILE_DATA_DIR_REF "/data/misc/profiles/ref"

#define TOMBSTONE_DIR "/data/tombstones"

#define TOMBSTONE_DIR "/data/tombstones"

#define TOMBSTONE_FILE_PREFIX TOMBSTONE_DIR "/tombstone_"

#define TOMBSTONE_FILE_PREFIX TOMBSTONE_DIR "/tombstone_"

/* Can accomodate a tombstone number up to 9999. */

/* Can accomodate a tombstone number up to 9999. */
@@ -1346,6 +1348,10 @@ int main(int argc, char *argv[]) { 
    add_dir(RECOVERY_DIR, true);

    add_dir(RECOVERY_DIR, true);

    add_dir(RECOVERY_DATA_DIR, true);

    add_dir(RECOVERY_DATA_DIR, true);

    add_dir(LOGPERSIST_DATA_DIR, false);

    add_dir(LOGPERSIST_DATA_DIR, false);

    if (!is_user_build()) {

        add_dir(PROFILE_DATA_DIR_CUR, true);

        add_dir(PROFILE_DATA_DIR_REF, true);

    }

    add_mountinfo();

    add_mountinfo();





    if (!drop_root_user()) {

    if (!drop_root_user()) {