Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e7444b1 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882408

Change-Id: I6f4873fb4c6da52bba77de525ab7645a9e918cdc
parents bdefa4df b8b17a1f

services/core/java/com/android/server/media/MediaButtonReceiverHolder.java

+3 −0
Original line number Diff line number Diff line
@@ -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)