From 5482d342cdce275121f5003b2d48156706acdde3 Mon Sep 17 00:00:00 2001 From: Sungsoo Lim Date: Mon, 16 Nov 2015 14:00:52 +0900 Subject: [PATCH] Prevent NPE in MediaSessionService Guard against null UserRecord when dispatching a media key event. Bug: 22966229 Change-Id: I32f4f87e06d8af13b94bb8f28180a66517c23c33 --- services/core/java/com/android/server/media/MediaSessionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 7028fa6695f6..90dd10eae69a 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -948,8 +948,8 @@ public class MediaSessionService extends SystemService implements Monitor { // Launch the last PendingIntent we had with priority int userId = ActivityManager.getCurrentUser(); UserRecord user = mUserRecords.get(userId); - if (user.mLastMediaButtonReceiver != null - || user.mRestoredMediaButtonReceiver != null) { + if (user != null && (user.mLastMediaButtonReceiver != null + || user.mRestoredMediaButtonReceiver != null)) { if (DEBUG) { Log.d(TAG, "Sending media key to last known PendingIntent " + user.mLastMediaButtonReceiver + " or restored Intent " -- 2.11.0