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

Commit bc195a6b authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in MediaSessionService"

parents 2189f58e 5482d342

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

+2 −2
Original line number Diff line number Diff line
@@ -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 "