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

Commit 576b1eea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make sure to remove NotificationShade surface when keyguard went away."... 

Merge "Make sure to remove NotificationShade surface when keyguard went away." into sc-dev am: 123b1060 am: 4f720295 am: 10ad06d0

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

Change-Id: I403636619479b0f76b65333745ece386a23843de
parents d9de3723 10ad06d0

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

+11 −0
Original line number Diff line number Diff line
@@ -2329,6 +2329,17 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                result |= RELAYOUT_RES_SURFACE_CHANGED;

                if (!win.mWillReplaceWindow) {

                    // When FLAG_SHOW_WALLPAPER flag is removed from a window, we usually set a flag

                    // in DC#pendingLayoutChanges and update the wallpaper target later.

                    // However it's possible that FLAG_SHOW_WALLPAPER flag is removed from a window

                    // when the window is about to exit, so we update the wallpaper target

                    // immediately here. Otherwise this window will be stuck in exiting and its

                    // surface remains on the screen.

                    // TODO(b/189856716): Allow destroying surface even if it belongs to the

                    //  keyguard target.

                    if (wallpaperMayMove) {

                        displayContent.mWallpaperController.adjustWallpaperWindows();

                    }

                    focusMayChange = tryStartExitingAnimation(win, winAnimator, focusMayChange);

                }

            }