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

Commit ce2268b7 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Updates the dim for USER_SYSTEM if mCurrentUserId = null" into main

parents 5cf19066 5c58aae5

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -2729,8 +2729,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        try {

            List<WallpaperData> pendingColorExtraction = new ArrayList<>();

            synchronized (mLock) {

                WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId);

                WallpaperData lockWallpaper = mLockWallpaperMap.get(mCurrentUserId);

                // If called in boot before mCurrentUserId is set, sets the dim for USER_SYSTEM.

                int userId = mCurrentUserId != UserHandle.USER_NULL

                        ? mCurrentUserId : UserHandle.USER_SYSTEM;

                WallpaperData wallpaper = mWallpaperMap.get(userId);

                WallpaperData lockWallpaper = mLockWallpaperMap.get(userId);



                if (dimAmount == 0.0f) {

                    wallpaper.mUidToDimAmount.remove(uid);