commit 333bb3d798380d17ebd652b244d4be58c745cd0a
author Andy Hung <hunga@google.com> Fri Jan 31 20:17:48 2020 -0800
committer Andy Hung <hunga@google.com> Wed Feb 05 14:42:51 2020 -0800
tree baff29f6041653b1e2d2ac3e1b0372b7e9825f26
parent 9e89b4f032783fbbfb9169d51d8538674fe720ca

MediaMetrics: Minor logging fixes

Remove extraneous right brace in Time Machine dump.
Do not suppress repeated EVENT properties in the Time Machine.
Use "--" prefix instead of "-" for long dumpsys argv options.

Test: atest mediametrics_tests
Test: adb shell dumpsys media.metrics
Bug: 138583596
Change-Id: I874be909ac08641b14dd12fb2c83de7a276a1796

services/mediametrics/MediaMetricsService.cpp

diff --git a/services/mediametrics/MediaMetricsService.cpp b/services/mediametrics/MediaMetricsService.cpp
index 4f8589c..2fd1355 100644
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -204,13 +204,13 @@
     }
 
     // crack any parameters
-    const String16 protoOption("-proto");
-    const String16 clearOption("-clear");
+    const String16 protoOption("--proto");
+    const String16 clearOption("--clear");
     bool clear = false;
-    const String16 sinceOption("-since");
+    const String16 sinceOption("--since");
     nsecs_t ts_since = 0;
-    const String16 helpOption("-help");
-    const String16 onlyOption("-only");
+    const String16 helpOption("--help");
+    const String16 onlyOption("--only");
     std::string only;
     const int n = args.size();
     for (int i = 0; i < n; i++) {
@@ -250,11 +250,11 @@
             // or dumpsys media.metrics audiotrack codec
 
             result.append("Recognized parameters:\n");
-            result.append("-help        this help message\n");
-            result.append("-proto #     dump using protocol #");
-            result.append("-clear       clears out saved records\n");
-            result.append("-only X      process records for component X\n");
-            result.append("-since X     include records since X\n");
+            result.append("--help        this help message\n");
+            result.append("--proto #     dump using protocol #");
+            result.append("--clear       clears out saved records\n");
+            result.append("--only X      process records for component X\n");
+            result.append("--since X     include records since X\n");
             result.append("             (X is milliseconds since the UNIX epoch)\n");
             write(fd, result.string(), result.size());
             return NO_ERROR;

services/mediametrics/TimeMachine.h

diff --git a/services/mediametrics/TimeMachine.h b/services/mediametrics/TimeMachine.h
index 87de1c4..0440e5b 100644
--- a/services/mediametrics/TimeMachine.h
+++ b/services/mediametrics/TimeMachine.h
@@ -168,7 +168,6 @@
                 ss << "(" << (offset == 0 ? "" : "~") << &timestring.time[offset]
                     << ") " << eptr->second;
                 if (++eptr == timeSequence.end()) {
-                    ss << "}";
                     break;
                 }
                 ss << ", ";