Merge "MediaSessionService: Fix NPE when startup" into rvc-dev

2020-06-18 06:23:34 +00:00
parent d65f6e8fb4 d555ba85dc
commit b8b17a1f5f
1 changed files with 3 additions and 0 deletions
--- 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)