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

* commit '0ec4b9363a0298b2da532d3591f4ae99b04d88db':
  adb shouldn't trace unless told to

adb/adb.cpp

@@ -190,6 +190,13 @@ static void setup_trace_mask() {
 }
 
 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();