commit e41170094182c932bbfeac034ba1aa0d2c5520db
author Andy Hung <hunga@google.com> Mon Sep 16 17:37:13 2024 -0700
committer Andy Hung <hunga@google.com> Tue Sep 17 11:02:02 2024 -0700
tree 37f83c03e4715d23bec686ed67b6794a2cd7e00f
parent 0c2752b6ad50c0adb5951fd3bc5b95738cb1bcb5

MediaMetrics: Prune audio analytics dump

Remove duplication in TransactionLog and TimeMachine
due to truncation at the dumpsys.  These can still be obtained
by the --all option.

Slight increase in the recorded queue from 2000 to 2500 items.

Flag: EXEMPT bugfix
Test: adb shell dumpsys media.metrics
Test: atest mediametrics_tests
Bug: 367363495
Change-Id: I715b0bb3e580636ac6ba6a47e39112ab9cfaa937

services/mediametrics/AudioAnalytics.cpp

diff --git a/services/mediametrics/AudioAnalytics.cpp b/services/mediametrics/AudioAnalytics.cpp
index bd4ac38..c01d46e 100644
--- a/services/mediametrics/AudioAnalytics.cpp
+++ b/services/mediametrics/AudioAnalytics.cpp
@@ -555,22 +555,24 @@
 }
 
 std::pair<std::string, int32_t> AudioAnalytics::dump(
-        int32_t lines, int64_t sinceNs, const char *prefix) const
+        bool details, int32_t lines, int64_t sinceNs, const char *prefix) const
 {
     std::stringstream ss;
     int32_t ll = lines;
 
     if (ll > 0) {
-        auto [s, l] = mAnalyticsState->dump(ll, sinceNs, prefix);
+        auto [s, l] = mAnalyticsState->dump(details, ll, sinceNs, prefix);
         ss << s;
         ll -= l;
     }
-    if (ll > 0) {
+
+    // use details to dump prior state.
+    if (details && ll > 0) {
         ss << "Prior audioserver state:\n";
         --ll;
     }
-    if (ll > 0) {
-        auto [s, l] = mPreviousAnalyticsState->dump(ll, sinceNs, prefix);
+    if (details && ll > 0) {
+        auto [s, l] = mPreviousAnalyticsState->dump(details, ll, sinceNs, prefix);
         ss << s;
         ll -= l;
     }