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

Commit 146583ef authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

Merge "Fix getWallpaperSafeLocked" into udc-qpr-dev am: 417b153e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25089203



Change-Id: If8b13d6e47d4e543bcd8399d4cc5f7fec4151d78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 540dcd10 417b153e

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -3951,7 +3951,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        if (wallpaper == null) {

        if (wallpaper == null) {

            // common case, this is the first lookup post-boot of the system or

            // 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.

            // 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);

            loadSettingsLocked(userId, false, whichLoad);

            wallpaper = whichSet.get(userId);

            wallpaper = whichSet.get(userId);

            if (wallpaper == null) {

            if (wallpaper == null) {