From fd70b1bec12d5997d7553647cd429ea56d17572f Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Mon, 17 Oct 2022 17:08:21 +0000
Subject: [PATCH] Add package name to unregister dumpsys events

Once unregistered, the dumpsys doesn't contain any more
info that we can cross-reference the id with. By including
the package name, at least we get some idea of where the
associated requests were coming from.

Test: Manually, using adb shell dumpsys media_router.
Bug: 243116883
Change-Id: I9d8c3187fcff9f495a2f5cc0859235674a61d52a
---
 .../server/media/MediaRouter2ServiceImpl.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 909c1a143b8d3..b10dcae8400d3 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -725,8 +725,12 @@ class MediaRouter2ServiceImpl {
             return;
         }
 
-        mEventLogger.log(EventLogger.StringEvent.from("unregisterRouter2",
-                "router id: %d", routerRecord.mRouterId));
+        mEventLogger.log(
+                EventLogger.StringEvent.from(
+                        "unregisterRouter2",
+                        "package: %s, router id: %d",
+                        routerRecord.mPackageName,
+                        routerRecord.mRouterId));
 
         UserRecord userRecord = routerRecord.mUserRecord;
         userRecord.mRouterRecords.remove(routerRecord);
@@ -1034,9 +1038,12 @@ class MediaRouter2ServiceImpl {
         UserRecord userRecord = managerRecord.mUserRecord;
 
         mEventLogger.log(
-                EventLogger.StringEvent.from("unregisterManager",
-                        "userId: %d, managerId: %d",
-                        userRecord.mUserId, managerRecord.mManagerId));
+                EventLogger.StringEvent.from(
+                        "unregisterManager",
+                        "package: %s, userId: %d, managerId: %d",
+                        managerRecord.mPackageName,
+                        userRecord.mUserId,
+                        managerRecord.mManagerId));
 
         userRecord.mManagerRecords.remove(managerRecord);
         managerRecord.dispose();