diff options
| -rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 6 |
1 files changed, 4 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 0ccbb251d2a2..a7c203dca03b 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -1303,8 +1303,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub synchronized (mLock) { if (mCurrentUserId == userId) { if (mWaitingForUnlock) { - // If we're switching users, now is when we transition the wallpaper - switchUser(userId, null); + // the desired wallpaper is not direct-boot aware, load it now + final WallpaperData systemWallpaper = + getWallpaperSafeLocked(userId, FLAG_SYSTEM); + switchWallpaper(systemWallpaper, null); } // Make sure that the SELinux labeling of all the relevant files is correct. |