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

Commit ac5055af authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even... 

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

* commit '8bb6b3e1':
  adb: call android::base::InitLogging even when adb tracing is disabled
parents 68ff9f2c 8bb6b3e1

adb/adb.cpp

+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();