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

Commit 9760c43a 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... 

Merge "MediaSessionService: Fix NPE when startup" into rvc-dev am: b8b17a1f am: 7e7444b1 am: 95436fe0

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

Change-Id: I439b992ba6644ece6db61a73324fe934500b0aa7
parents 2d448617 95436fe0

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,9 @@ final class MediaButtonReceiverHolder { 
            return null;

            return null;

        }

        }

        ComponentName componentName = ComponentName.unflattenFromString(tokens[0]);

        ComponentName componentName = ComponentName.unflattenFromString(tokens[0]);

        if (componentName == null) {

            return null;

        }

        int userId = Integer.parseInt(tokens[1]);

        int userId = Integer.parseInt(tokens[1]);

        // Guess component type if the OS version is updated from the older version.

        // Guess component type if the OS version is updated from the older version.

        int componentType = (tokens.length == 3)

        int componentType = (tokens.length == 3)