Merge "Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566 am: f8ca1f7ef9" into sc-v2-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2021-06-21 20:07:27 +00:00
committed by Android (Google) Code Review

View File

@@ -2598,6 +2598,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
private void setupWindowForRemoveOnExit() {
mRemoveOnExit = true;
setDisplayLayoutNeeded();
getDisplayContent().getDisplayPolicy().removeWindowLw(this);
// Request a focus update as this window's input channel is already gone. Otherwise
// we could have no focused window in input manager.
final boolean focusChanged = mWmService.updateFocusedWindowLocked(