commit 18a2c167f773c3d4587a0bcb0c180ddda188ef39
author Paul Lawrence <paullawrence@google.com> Sat Jun 06 00:35:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 06 00:35:18 2015 +0000
tree 48540cd8eeecc93d73ec0b54545d4cdf2f4b538a
parent a73075df36773ba509381bf4ab8214de7f48999b
parent 0caea07e3aa302d9e17026d3c392aa2412eb0cd2

am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to"

* commit '439cdfd0bfa8ee2cf0996f517e61ab9f7d90bdc6':
  adb shouldn't trace unless told to

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index ff6a499..371525c 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -190,6 +190,13 @@
 }
 
 void adb_trace_init(char** argv) {
+    // Don't open log file if no tracing, since this will block
+    // the crypto unmount of /data
+    const std::string trace_setting = get_trace_setting();
+    if (trace_setting.empty()) {
+        return;
+    }
+
 #if !ADB_HOST
     if (isatty(STDOUT_FILENO) == 0) {
         start_device_log();