commit 649fc605f8094c06a38251466ccb15a722e8a91f
author Mark Salyzyn <salyzyn@google.com> Tue Sep 16 09:15:15 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Sep 16 09:27:37 2014 -0700
tree d8763ef8989d3192b14482bb5c0546de83c6f26c
parent 17077a287c2260a35ea99e19b0308e479edc6cbb

logcat: -v format defaults to threadtime

Change-Id: Iafddf83b0507a667e0395d38ec9afaed67319018

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index fecbdb7..b557011 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -259,7 +259,7 @@
                    "\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 @@
                     exit(-1);
                 }
 
-                hasSetLogFormat = 1;
+                if (strcmp("color", optarg)) { // exception for modifiers
+                    hasSetLogFormat = 1;
+                }
             break;
 
             case 'Q':
@@ -653,11 +655,12 @@
 
         if (logFormat != NULL) {
             err = setLogFormat(logFormat);
-
             if (err < 0) {
                 fprintf(stderr, "invalid format in ANDROID_PRINTF_LOG '%s'\n",
                                     logFormat);
             }
+        } else {
+            setLogFormat("threadtime");
         }
     }