From 2634b66f20af97eb9210434d96830cf02ab246ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= <ivanbuper@google.com>
Date: Mon, 26 Sep 2022 10:01:40 +0000
Subject: [PATCH] Improve MediaButtonReceiverHolder toString()

This exposes the MBR's component name and session package name, which
will be quite helpful for the media_session dumpsys.

Bug: 205124386
Bug: 244312001
Test: adb shell dumpsys media_session
Change-Id: I48a6df78e8642e8ed8334fdfc75b1a6a52530e57
---
 .../server/media/MediaButtonReceiverHolder.java       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
index 9a190316f4eb6..b1e8b407d6e86 100644
--- a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
+++ b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
@@ -246,10 +246,13 @@ final class MediaButtonReceiverHolder {
 
     @Override
     public String toString() {
-        if (mPendingIntent != null) {
-            return "MBR {pi=" + mPendingIntent + ", type=" + mComponentType + "}";
-        }
-        return "Restored MBR {component=" + mComponentName + ", type=" + mComponentType + "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("MBR {pi=").append(mPendingIntent);
+        sb.append(", componentName=").append(mComponentName);
+        sb.append(", type=").append(mComponentType);
+        sb.append(", pkg=").append(mPackageName);
+        sb.append("}");
+        return sb.toString();
     }
 
     /**