Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie99f8ac4777b33847c867d70721644e9a6abedac
This commit is contained in:
Sungsoo Lim
2020-06-18 14:56:17 +00:00
committed by Automerger Merge Worker
parent a079771a22 f6dc8614ee
commit 3388babc2f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
View File

@@ -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)