commit 0513b5dfd08a813dd29b95b79e5a52677500206f
author Eric Tan <taneric@google.com> Mon Sep 17 10:32:48 2018 -0700
committer Eric Tan <taneric@google.com> Mon Sep 17 18:29:49 2018 -0700
tree 4f780d0d72ace741eaf3bc3631f353452dc357f8
parent cfa7c4b96ced4a086bffabdd4394fb19c9400524

Add options to dumpsys media.log and dump visualizations

Other Changes:
- added thread_params_t type to NBLog
- rearranged ordering of macros in TypedLogger.h

Test: dumpsys media.log with --json, --pa, and --plots options
Bug: 68148948
Change-Id: If97714271a085a99bba0ab3ae0c268a9f407f053

services/medialog/MediaLogService.cpp

diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp
index 0598ce7..902af66 100644
--- a/services/medialog/MediaLogService.cpp
+++ b/services/medialog/MediaLogService.cpp
@@ -119,7 +119,6 @@
                 } else {
                     ALOGW("%s:", result.string());
                 }
-                // TODO should we instead proceed to mMergeReader.dump? does it need lock?
                 return NO_ERROR;
             }
 
@@ -132,9 +131,10 @@
                 }
             }
             mLock.unlock();
+        } else {
+            mMergeReader.dump(fd, args);
         }
     }
-    mMergeReader.dump(fd);
     return NO_ERROR;
 }