ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit 'af0baad7a6407cf098aa64272e1321f7a495874a':
  adb shouldn't trace unless told to
This commit is contained in:
Paul Lawrence 2015-06-06 00:23:06 +00:00 • committed by Android Git Automerger
commit 439cdfd0bf
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/adb.cpp
View file

@ -190,6 +190,13 @@ static void setup_trace_mask() {
} }
void adb_trace_init(char** argv) { 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 !ADB_HOST
if (isatty(STDOUT_FILENO) == 0) { if (isatty(STDOUT_FILENO) == 0) {
start_device_log(); start_device_log();