am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
* commit 'b62f6c2a1cc9f7697abb6fc5c74565da6631e0dd':
adb: call android::base::InitLogging even when adb tracing is disabled
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