commit d886ec496952a19bee202bc3d6f670009c3a0689
author Ajay Panicker <apanicke@google.com> Wed Sep 14 12:26:46 2016 -0700
committer Ajay Panicker <apanicke@google.com> Fri Sep 23 11:47:55 2016 -0700
tree 6c98b190b9d832769b3b39132d989ecdce6f7353
parent 96fc72d19e17d6d6dae1f3bdaca888a2db658f77

Add btsnoop_hci.log to bugreport zip (1/2)

Bug: 28672558
Test: Manual
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
(cherry picked from commit efb524693b8b77e6c77f3ebc6b9878caa5aa9715)

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 691863b..3b9d590 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -880,6 +880,9 @@
     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

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index b49d6ef..9e042c9 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -909,7 +909,8 @@
     }
 
     gid_t groups[] = { AID_LOG, AID_SDCARD_R, AID_SDCARD_RW,
-            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK };
+            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK,
+            AID_BLUETOOTH };
     if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
         MYLOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
         return false;