Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62f6c2a authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "adb: call android::base::InitLogging even when adb tracing is disabled"

parents cef3508b 74309160
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -192,17 +192,14 @@ static void setup_trace_mask() {
}

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 (!get_trace_setting().empty()) {
        if (isatty(STDOUT_FILENO) == 0) {
            start_device_log();
        }
    }
#endif

    setup_trace_mask();