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

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

Browse source 
* commit 'b62f6c2a1cc9f7697abb6fc5c74565da6631e0dd':
  adb: call android::base::InitLogging even when adb tracing is disabled
This commit is contained in:
Elliott Hughes 2015-08-12 03:23:22 +00:00 • committed by Android Git Automerger
commit 8bb6b3e1ff
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/adb.cpp
View file

@ -192,16 +192,13 @@ static void setup_trace_mask() {
} }
void adb_trace_init(char** argv) { void adb_trace_init(char** argv) {
#if !ADB_HOST
// Don't open log file if no tracing, since this will block // Don't open log file if no tracing, since this will block
// the crypto unmount of /data // the crypto unmount of /data
const std::string trace_setting = get_trace_setting(); if (!get_trace_setting().empty()) {
if (trace_setting.empty()) { if (isatty(STDOUT_FILENO) == 0) {
return; start_device_log();
} }
#if !ADB_HOST
if (isatty(STDOUT_FILENO) == 0) {
start_device_log();
} }
#endif #endif