tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '8bb6b3e1ffc44336f89eb30cc39a1e96498c7c23':
  adb: call android::base::InitLogging even when adb tracing is disabled
This commit is contained in:
Elliott Hughes 2015-08-12 03:31:19 +00:00 committed by Android Git Automerger
commit 9cb4af39af
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) {
#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 (isatty(STDOUT_FILENO) == 0) {
start_device_log();
if (!get_trace_setting().empty()) {
if (isatty(STDOUT_FILENO) == 0) {
start_device_log();
}
}
#endif