commit 8d97c932b0814dac99cf65e511cfd970e2939622
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 26 18:33:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 26 18:33:13 2016 +0000
tree af9234c4bb2315112699ac4c57ecfae606da19bc
parent d886ec496952a19bee202bc3d6f670009c3a0689
parent 9ce6aa4d22f6afee2c682cf2e40bf50575f3cc61

Merge "Use a system property to define extra command-line arguments."

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 1eac43d..dc68d11 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -887,6 +887,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;