diff options
| -rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index f8eb78914857..abc6bf698d66 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -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); |