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

resolve merge conflicts of 5b6c034 to stage-aosp-master

Browse Source 
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
This commit is contained in:
Jae Seo
2016-07-06 00:45:15 -07:00
parent 9ede567f7c 5b6c03415c
commit 5f5bd8848c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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() {
synchronized (mLock) {
int userId = ActivityManager.getCurrentUser(); int userId = ActivityManager.getCurrentUser();
synchronized (mLock) {
if (mCurrentUserId != userId) { if (mCurrentUserId != userId) {
final int oldUserId = mCurrentUserId; final int oldUserId = mCurrentUserId;
mCurrentUserId = userId; // do this first mCurrentUserId = userId; // do this first