[automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429cc2

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

Bug: 215685199
Change-Id: I04f28289f660042f90ca515c403916828ebedd2e
This commit is contained in:
Presubmit Automerger Backend
2022-02-23 10:44:25 +00:00

View File

@@ -202,8 +202,11 @@ class WallpaperController {
"Win " + w + ": token animating, looking behind."); "Win " + w + ": token animating, looking behind.");
} }
mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground()); mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());
// Found a target! End search. // While the keyguard is going away, both notification shade and a normal activity such
return true; // as a launcher can satisfy criteria for a wallpaper target. In this case, we should
// chose the normal activity, otherwise wallpaper becomes invisible when a new animation
// starts before the keyguard going away animation finishes.
return w.mActivityRecord != null;
} }
return false; return false;
}; };