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

Commit 74c927fd authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Add NfcSNOOP log in bugreport" am: f1cfae86 am: 26b69560 am: 15ff0c1e am: 24898cad 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1400132

Change-Id: I55ce858b91affad22c8383be1c0562ee9049074e
parents db0232d8 24898cad

cmds/dumpstate/DumpstateInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ bool DropRootUser() { 


    static const std::vector<std::string> group_names{

        "log", "sdcard_r", "sdcard_rw", "mount", "inet", "net_bw_stats",

            "readproc", "bluetooth", "wakelock"};

            "readproc", "bluetooth", "wakelock", "nfc"};

    std::vector<gid_t> groups(group_names.size(), 0);

    for (size_t i = 0; i < group_names.size(); ++i) {

        grp = getgrnam(group_names[i].c_str());

cmds/dumpstate/dumpstate.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1636,6 +1636,8 @@ static Dumpstate::RunStatus dumpstate() { 


    /* Dump Bluetooth HCI logs */

    ds.AddDir("/data/misc/bluetooth/logs", true);

    /* Dump Nfc NCI logs */

    ds.AddDir("/data/misc/nfc/logs", true);



    if (ds.options_->do_screenshot && !ds.do_early_screenshot_) {

        MYLOGI("taking late screenshot\n");