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

am a3e53f1d: Merge "logcat: -v format defaults to threadtime"

Browse source 
* commit 'a3e53f1dfe2686e6f0bad75a587f779d955427b3':
  logcat: -v format defaults to threadtime
This commit is contained in:
Mark Salyzyn 2014-09-16 17:06:00 +00:00 committed by Android Git Automerger
commit a9d789dd8a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logcat/logcat.cpp
View file

@ -259,7 +259,7 @@ static void show_help(const char *cmd)
"\nIf not specified on the commandline, filterspec is set from ANDROID_LOG_TAGS.\n"
"If no filterspec is found, filter defaults to '*:I'\n"
"\nIf not specified with -v, format is set from ANDROID_PRINTF_LOG\n"
"or defaults to \"brief\"\n\n");
"or defaults to \"threadtime\"\n\n");
@ -543,7 +543,9 @@ int main(int argc, char **argv)
exit(-1);
}
hasSetLogFormat = 1;
if (strcmp("color", optarg)) { // exception for modifiers
hasSetLogFormat = 1;
}
break;
case 'Q':
@ -653,11 +655,12 @@ int main(int argc, char **argv)
if (logFormat != NULL) {
err = setLogFormat(logFormat);
if (err < 0) {
fprintf(stderr, "invalid format in ANDROID_PRINTF_LOG '%s'\n",
logFormat);
}
} else {
setLogFormat("threadtime");
}
}