From d555ba85dcb334ddc4c42d4ea6a1142c5a750a7d Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Wed, 17 Jun 2020 22:17:16 +0900
Subject: [PATCH] MediaSessionService: Fix NPE when startup

Bug: 158050954
Test: Manually tested that the issue is gone after following command
      $ adb shell
      $ settings secure put media_button_receiver ",10"
      $ reboot
Change-Id: I0d7df2d349140c09282d029df80c2cf2060c5405
---
 .../com/android/server/media/MediaButtonReceiverHolder.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
index 58c2707a1f196..9dae1b44117b1 100644
--- a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
+++ b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
@@ -85,6 +85,9 @@ final class MediaButtonReceiverHolder {
             return null;
         }
         ComponentName componentName = ComponentName.unflattenFromString(tokens[0]);
+        if (componentName == null) {
+            return null;
+        }
         int userId = Integer.parseInt(tokens[1]);
         // Guess component type if the OS version is updated from the older version.
         int componentType = (tokens.length == 3)