commit a6cbf6bd42738cf7a753e60e0216f9f49f13ef1c
author Ajay Panicker <apanicke@google.com> Fri May 05 00:16:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 00:16:56 2017 +0000
tree 52e8b376120c6060d159abc49438c01841a6be2f
parent 8879d78fee9576700240c2ea99ae68a9fc5f97ef
parent a566e4b48e93ad1bf228aa454866d307175c26a0

Merge "Re-enable the zipping of bluetooth logs" into oc-dev am: cf2efe056b
am: a566e4b48e

Change-Id: I2ce50377dad4380492f96e6d808d8cad609b1ee2

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 5dad511..f84d86d 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -998,13 +998,8 @@
     for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS");
     for_each_pid(show_showtime, "PROCESS TIMES (pid cmd user system iowait+percentage)");
 
-    if (true) {
-        // TODO: temporary disabled because /data/misc/bluetooth/logs/btsnoop_hci.log can be huge
-        MYLOGD("Skipping /data/misc/bluetooth/logs");
-    } else {
-        /* Dump Bluetooth HCI logs */
-        ds.AddDir("/data/misc/bluetooth/logs", true);
-    }
+    /* Dump Bluetooth HCI logs */
+    ds.AddDir("/data/misc/bluetooth/logs", true);
 
     if (!ds.do_early_screenshot_) {
         MYLOGI("taking late screenshot\n");