Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f35e05 authored by Jae Seo's avatar Jae Seo Committed by android-build-merger
Browse files

resolve merge conflicts of 5b6c0341 to stage-aosp-master am: 5f5bd884 

am: 8575120f

Change-Id: I31939710a2e8b2accc5445048bc6c0376d1371e6
parents 4f174386 8575120f

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

+1 −1
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