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

Commit 439cdfd0 authored by Paul Lawrence's avatar Paul Lawrence Committed by Android Git Automerger
Browse files

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

* commit 'af0baad7':
  adb shouldn't trace unless told to
parents 57a3407d af0baad7
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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();