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

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

Browse Source 
* commit 'cbcbb828e8e3d1f901be00c896d816d01c17b19d':
  Prevent NPE in MediaSessionService
This commit is contained in:
Jean-Michel Trivi
2015-05-11 23:08:38 +00:00
committed by Android Git Automerger
parent dac87a10d4 cbcbb828e8
commit 9e81e95689
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -765,8 +765,9 @@ public class MediaSessionService extends SystemService implements Monitor {
// If we don't have a media button receiver to fall back on // If we don't have a media button receiver to fall back on
// include non-playing sessions for dispatching // include non-playing sessions for dispatching
UserRecord ur = mUserRecords.get(ActivityManager.getCurrentUser()); UserRecord ur = mUserRecords.get(ActivityManager.getCurrentUser());
boolean useNotPlayingSessions = ur.mLastMediaButtonReceiver == null boolean useNotPlayingSessions = (ur == null) ||
&& ur.mRestoredMediaButtonReceiver == null; (ur.mLastMediaButtonReceiver == null
&& ur.mRestoredMediaButtonReceiver == null);
MediaSessionRecord session = mPriorityStack MediaSessionRecord session = mPriorityStack
.getDefaultMediaButtonSession(mCurrentUserId, useNotPlayingSessions); .getDefaultMediaButtonSession(mCurrentUserId, useNotPlayingSessions);
if (isVoiceKey(keyEvent.getKeyCode())) { if (isVoiceKey(keyEvent.getKeyCode())) {