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

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

Merge "Fix getWallpaperSafeLocked" into main

parents c30f220f ec29cb22
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -3982,7 +3982,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
        if (wallpaper == null) {
            // common case, this is the first lookup post-boot of the system or
            // unified lock, so we bring up the saved state lazily now and recheck.
            int whichLoad = (which == FLAG_LOCK) ? FLAG_LOCK : FLAG_SYSTEM;
            // if we're loading the system wallpaper for the first time, also load the lock
            // wallpaper to determine if the system wallpaper is system+lock or system only.
            int whichLoad = (which == FLAG_LOCK) ? FLAG_LOCK : FLAG_SYSTEM | FLAG_LOCK;
            loadSettingsLocked(userId, false, whichLoad);
            wallpaper = whichSet.get(userId);
            if (wallpaper == null) {