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

Commit 7b713207 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid the keyguard being a wallpaper target" into main am: 088aa382 

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



Change-Id: I97bd981fc418a62dfed0e7fecf5b10291f3dbee6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2302db3c 088aa382

services/core/java/com/android/server/wm/WallpaperController.java

+2 −2
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ class WallpaperController { 
            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());