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

Commit bc06c07e authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Add btsnoop_hci.log to bugreport zip (1/2)" am: d95b2eb2 

am: 7821d52b

Change-Id: If0666e35c49942a980c538bf02d29010cfe70545
parents d1a3db64 7821d52b

cmds/dumpstate/dumpstate.cpp

+3 −0
Original line number Diff line number Diff line
@@ -675,6 +675,9 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
    for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS");

    for_each_pid(show_showtime, "PROCESS TIMES (pid cmd user system iowait+percentage)");



    /* Dump Bluetooth HCI logs */

    add_dir("/data/misc/bluetooth/logs", true);



    if (!screenshot_path.empty()) {

        MYLOGI("taking late screenshot\n");

        take_screenshot(screenshot_path);

cmds/dumpstate/utils.cpp

+2 −1
Original line number Diff line number Diff line
@@ -828,7 +828,8 @@ bool drop_root_user() { 
    }



    gid_t groups[] = { AID_LOG, AID_SDCARD_R, AID_SDCARD_RW,

            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC };

            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC,

            AID_BLUETOOTH };

    if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {

        MYLOGE("Unable to setgroups, aborting: %s\n", strerror(errno));

        return false;