commit 15ff0c1e634c79cab5bfff5f0adb8384ef3305bb
author Jack Yu <jackcwyu@google.com> Fri Oct 16 08:24:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 16 08:24:14 2020 +0000
tree 12628bb25699e24bd56d8140c0e4111997017e77
parent e4079e2e390d90a9d01444f54df84271ce193b55
parent 26b69560b149319ccd9565d7b01f42fa0f22ca3a

Merge "Add NfcSNOOP log in bugreport" am: f1cfae86f2 am: 26b69560b1

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

Change-Id: I0db5371ffd35ba47c4e5a9f1b2496f675284369e

cmds/dumpstate/DumpstateInternal.cpp

diff --git a/cmds/dumpstate/DumpstateInternal.cpp b/cmds/dumpstate/DumpstateInternal.cpp
index bbc724c..3091f6b 100644
--- a/cmds/dumpstate/DumpstateInternal.cpp
+++ b/cmds/dumpstate/DumpstateInternal.cpp
@@ -69,7 +69,7 @@
 
     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

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index edad3fd..84de9f3 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1507,6 +1507,8 @@
 
     /* 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");