commit 2df67f605514fdba9425fcd75a8541adedd83fc9
author Elliott Hughes <enh@google.com> Wed Aug 12 03:31:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 12 03:31:19 2015 +0000
tree 549683d57bd357096cf5e12500d59232fde42fc1
parent 0833428bc5da62214416e2045dbe888c1e5d1397
parent 0571384aedbe7cb3746066d2f6a550d6bccd28f9

am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"

* commit '8bb6b3e1ffc44336f89eb30cc39a1e96498c7c23':
  adb: call android::base::InitLogging even when adb tracing is disabled

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 821b785..fc7320c 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -192,16 +192,13 @@
 }
 
 void adb_trace_init(char** argv) {
+#if !ADB_HOST
     // 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();
+    if (!get_trace_setting().empty()) {
+        if (isatty(STDOUT_FILENO) == 0) {
+            start_device_log();
+        }
     }
 #endif