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

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

Merge "Fix packageMonitor" into main

parents 40ac77cf d9dc5640

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

+1 −1
Original line number Diff line number Diff line
@@ -2843,7 +2843,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        WallpaperData systemWallpaper = mWallpaperMap.get(mCurrentUserId);

        WallpaperData lockWallpaper = mLockWallpaperMap.get(mCurrentUserId);

        boolean systemValid = systemWallpaper != null;

        boolean lockValid = lockWallpaper != null && !isLockscreenLiveWallpaperEnabled();

        boolean lockValid = lockWallpaper != null && isLockscreenLiveWallpaperEnabled();

        return systemValid && lockValid ? new WallpaperData[]{systemWallpaper, lockWallpaper}

                : systemValid ? new WallpaperData[]{systemWallpaper}

                : lockValid ? new WallpaperData[]{lockWallpaper}