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

Merge "Fix deadlock in MediaSessionService during getCurrentUser()"

Browse Source
This commit is contained in:
Jae Seo
2016-07-06 07:15:54 +00:00
committed by Gerrit Code Review
parent 326e55a3e2 c4f28a4196
commit 5b6c03415c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,8 +227,8 @@ public class MediaSessionService extends SystemService implements Monitor {
} }
private void updateUser() { private void updateUser() {
int userId = ActivityManager.getCurrentUser();
synchronized (mLock) { synchronized (mLock) {
int userId = ActivityManager.getCurrentUser();
if (mCurrentUserId != userId) { if (mCurrentUserId != userId) {
final int oldUserId = mCurrentUserId; final int oldUserId = mCurrentUserId;
mCurrentUserId = userId; // do this first mCurrentUserId = userId; // do this first
@@ -764,7 +764,7 @@ public class MediaSessionService extends SystemService implements Monitor {
synchronized (mLock) { synchronized (mLock) {
// 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(mCurrentUserId);
boolean useNotPlayingSessions = (ur == null) || boolean useNotPlayingSessions = (ur == null) ||
(ur.mLastMediaButtonReceiver == null (ur.mLastMediaButtonReceiver == null
&& ur.mRestoredMediaButtonReceiver == null); && ur.mRestoredMediaButtonReceiver == null);
@@ -957,8 +957,7 @@ public class MediaSessionService extends SystemService implements Monitor {
mKeyEventReceiver); mKeyEventReceiver);
} else { } else {
// Launch the last PendingIntent we had with priority // Launch the last PendingIntent we had with priority
int userId = ActivityManager.getCurrentUser(); UserRecord user = mUserRecords.get(mCurrentUserId);
UserRecord user = mUserRecords.get(userId);
if (user.mLastMediaButtonReceiver != null if (user.mLastMediaButtonReceiver != null
|| user.mRestoredMediaButtonReceiver != null) { || user.mRestoredMediaButtonReceiver != null) {
if (DEBUG) { if (DEBUG) {
@@ -979,7 +978,7 @@ public class MediaSessionService extends SystemService implements Monitor {
} else { } else {
mediaButtonIntent.setComponent(user.mRestoredMediaButtonReceiver); mediaButtonIntent.setComponent(user.mRestoredMediaButtonReceiver);
getContext().sendBroadcastAsUser(mediaButtonIntent, getContext().sendBroadcastAsUser(mediaButtonIntent,
new UserHandle(userId)); new UserHandle(mCurrentUserId));
} }
} catch (CanceledException e) { } catch (CanceledException e) {
Log.i(TAG, "Error sending key event to media button receiver " Log.i(TAG, "Error sending key event to media button receiver "