Merge "Fix deadlock in MediaSessionService during getCurrentUser()" (5b6c0341) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -227,8 +227,8 @@ public class MediaSessionService extends SystemService implements Monitor {
		}

		private void updateUser() {
		synchronized (mLock) {
		int userId = ActivityManager.getCurrentUser();
		synchronized (mLock) {
		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 "