commit 90eab928554616ca2e0c72942bffaeb787d0e53e
author Aurélien Pomini <pomini@google.com> Fri Oct 13 13:25:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 13 13:25:25 2023 +0000
tree 298097ffacf5d30e62d1075592d650c69fa2ccca
parent 40ac77cff2df57a83ae9c4d2f655e412179af51f
parent d9dc5640d0862e73dd98cf5ada1d7ebc828e95a8

Merge "Fix packageMonitor" into main

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

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 01ea33f..0718f2f 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2843,7 +2843,7 @@
         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}