From 7c77b2d13ce43a1666d26605341ea95455fea93a Mon Sep 17 00:00:00 2001
From: Jin Seok Park <jinpark@google.com>
Date: Thu, 24 Sep 2020 00:50:56 +0900
Subject: [PATCH] Fix logic for storing MediaButtonReceiver

Currently, MediaButtonReceiverHolder stores the
ComponentName.toString() value and tries to unflatten it with
ComponentName.unflattenFromString(String).
This causes restoring a stored MediaButtonReceiver to fail.

This CL changes it MediaButtonRecieverHolder store
ComponentName.flattenToString() value instead.

Bug: 169246173
Test: 1. Play music on YT Music.
      2. Reboot phone.
      3. Send media key event (PLAY)

Change-Id: I33449c0affd7f79e5988e7709cbbe45218766bf8
---
 .../com/android/server/media/MediaButtonReceiverHolder.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
index b9997e0c2ec8f..0a4d17f20aec3 100644
--- a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
+++ b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
@@ -259,7 +259,7 @@ final class MediaButtonReceiverHolder {
             return "";
         }
         return String.join(COMPONENT_NAME_USER_ID_DELIM,
-                mComponentName.toString(),
+                mComponentName.flattenToString(),
                 String.valueOf(mUserId),
                 String.valueOf(mComponentType));
     }