am af0baad7: Merge "adb shouldn\'t trace unless told to"
* commit 'af0baad7a6407cf098aa64272e1321f7a495874a': adb shouldn't trace unless told to
This commit is contained in:
commit
439cdfd0bf
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue