resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c am: 8575120faa

am: a9f35e05a5

Change-Id: Ied672d5708bf23ad297ca3df46be2bb6650bc459

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index cc4187fe80db..2446f6a0a596 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