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

am: 5f5bd8848c Change-Id: I4a2c518ff61f00d09efb92bd7da2e9bc477421f3
2016-07-06 07:55:48 +00:00
parent 61bb0a9ef4 5f5bd8848c
commit 8575120faa
1 changed files with 1 additions and 1 deletions
--- 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