From cc5d297caef47a7f91907d55a53f0257f8eba61b Mon Sep 17 00:00:00 2001
From: Jorge Gil <jorgegil@google.com>
Date: Thu, 16 Mar 2023 23:35:25 +0000
Subject: [PATCH] Always close the handle menu if the window loses focus

Bug: 271487478
Test: with two freeform tasks open, open the handle menu on the
focused one, then bring the other one to front, and make sure
the handle menu is closed on the original window

Change-Id: I3460e27e6523ebde1c400f4b9ad63387ed36bb1a
---
 .../wm/shell/windowdecor/DesktopModeWindowDecoration.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
index 01187ed94de5b..43605e30b8135 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
@@ -190,6 +190,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
         }
         mWindowDecorViewHolder.bindData(mTaskInfo);
 
+        if (!mTaskInfo.isFocused) {
+            closeHandleMenu();
+        }
+
         if (!isDragResizeable) {
             closeDragResizeListener();
             return;