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

Commit e38d01f4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25089203'] into udc-qpr1-release. 

Change-Id: I294620bb34d39443580947141bb917ead11c735c
parents fbceacb9 be88ec9e

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

+3 −1
Original line number Diff line number Diff line
@@ -3906,7 +3906,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) {