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

Commit 2bfa9ebb authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 9e81e956: am cbcbb828: Merge "Prevent NPE in MediaSessionService" into mnc-dev 

* commit '9e81e956':
  Prevent NPE in MediaSessionService
parents 1e0a344c 9e81e956

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

+3 −2
Original line number Diff line number Diff line
@@ -765,8 +765,9 @@ public class MediaSessionService extends SystemService implements Monitor { 
                    // If we don't have a media button receiver to fall back on

                    // include non-playing sessions for dispatching

                    UserRecord ur = mUserRecords.get(ActivityManager.getCurrentUser());

                    boolean useNotPlayingSessions = ur.mLastMediaButtonReceiver == null

                            && ur.mRestoredMediaButtonReceiver == null;

                    boolean useNotPlayingSessions = (ur == null) ||

                            (ur.mLastMediaButtonReceiver == null

                                && ur.mRestoredMediaButtonReceiver == null);

                    MediaSessionRecord session = mPriorityStack

                            .getDefaultMediaButtonSession(mCurrentUserId, useNotPlayingSessions);

                    if (isVoiceKey(keyEvent.getKeyCode())) {