| commit | 8971cdce7181845627fa2a9d298a2e5c5b3daa76 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 13 08:38:24 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 13 08:38:24 2024 +0000 |
| tree | 815caf2bb12c97c2c9a9123718cf16ecdfdf3a2b | |
| parent | 0312c6e94007644fb1a9c3120c53de4d2a2e5eb0 [diff] | |
| parent | 7b713207ff20298ef0bf0cea67a9295b1494fada [diff] |
Merge "Avoid the keyguard being a wallpaper target" into main am: 088aa3821f am: 7b713207ff Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3195734 Change-Id: If50d9ea22f73c0582c9108bb8e805a02f7d110c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 6ea1f3a..db95d96 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -177,8 +177,8 @@ if (DEBUG_WALLPAPER) Slog.v(TAG, "Found recents animation wallpaper target: " + w); mFindResults.setWallpaperTarget(w); return true; - } else if (hasWallpaper && w.isOnScreen() - && (mWallpaperTarget == w || w.isDrawFinishedLw())) { + } else if (hasWallpaper + && (w.mActivityRecord != null ? w.isOnScreen() : w.isReadyForDisplay())) { if (DEBUG_WALLPAPER) Slog.v(TAG, "Found wallpaper target: " + w); mFindResults.setWallpaperTarget(w); mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());