From 3c155090fe878518a2c316ffbafe31c25a10fd90 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Tue, 18 Oct 2022 13:02:43 +0000
Subject: [PATCH] Move EventLogger.dump call to MR2ServiceImpl.dump

It's a property of dump, not the user handler. So before
this change, the event logger would be dumped once per user.

Bug: 243116883
Test: Manually using adb shell dumpsys media_router
Change-Id: I5a36dac749dc9427e69639e12e561d56c27e63e8
---
 .../com/android/server/media/MediaRouter2ServiceImpl.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index b10dcae8400d3..5f06ca945eae1 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -628,8 +628,9 @@ class MediaRouter2ServiceImpl {
                     mUserRecords.valueAt(i).dump(pw, indent + "  ");
                 }
             } else {
-                pw.println(indent + "<no user records>");
+                pw.println(indent + "  <no user records>");
             }
+            mEventLogger.dump(pw, indent);
         }
     }
 
@@ -1382,8 +1383,6 @@ class MediaRouter2ServiceImpl {
             if (!mHandler.runWithScissors(() -> mHandler.dump(pw, indent), 1000)) {
                 pw.println(indent + "<could not dump handler state>");
             }
-
-            mEventLogger.dump(pw, indent);
         }
     }