summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt
index deef37874e79..9c73e4a38aa9 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt
@@ -121,8 +121,14 @@ class MaximizeMenu(
/** Closes the maximize window and releases its view. */
fun close() {
- maximizeMenuView?.animateCloseMenu {
- maximizeMenu?.releaseView()
+ val view = maximizeMenuView
+ val menu = maximizeMenu
+ if (view == null) {
+ menu?.releaseView()
+ } else {
+ view.animateCloseMenu {
+ menu?.releaseView()
+ }
}
maximizeMenu = null
maximizeMenuView = null