diff options
| -rw-r--r-- | services/core/java/com/android/server/media/MediaSessionService.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 1a320d2bdb80..b7190638b0e5 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -227,8 +227,8 @@ public class MediaSessionService extends SystemService implements Monitor { } private void updateUser() { + int userId = ActivityManager.getCurrentUser(); synchronized (mLock) { - int userId = ActivityManager.getCurrentUser(); if (mCurrentUserId != userId) { final int oldUserId = mCurrentUserId; mCurrentUserId = userId; // do this first @@ -764,7 +764,7 @@ public class MediaSessionService extends SystemService implements Monitor { synchronized (mLock) { // 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()); + UserRecord ur = mUserRecords.get(mCurrentUserId); boolean useNotPlayingSessions = (ur == null) || (ur.mLastMediaButtonReceiver == null && ur.mRestoredMediaButtonReceiver == null); @@ -957,8 +957,7 @@ public class MediaSessionService extends SystemService implements Monitor { mKeyEventReceiver); } else { // Launch the last PendingIntent we had with priority - int userId = ActivityManager.getCurrentUser(); - UserRecord user = mUserRecords.get(userId); + UserRecord user = mUserRecords.get(mCurrentUserId); if (user.mLastMediaButtonReceiver != null || user.mRestoredMediaButtonReceiver != null) { if (DEBUG) { @@ -979,7 +978,7 @@ public class MediaSessionService extends SystemService implements Monitor { } else { mediaButtonIntent.setComponent(user.mRestoredMediaButtonReceiver); getContext().sendBroadcastAsUser(mediaButtonIntent, - new UserHandle(userId)); + new UserHandle(mCurrentUserId)); } } catch (CanceledException e) { Log.i(TAG, "Error sending key event to media button receiver " |