Merge "Make sure to clear previous display's last focus window when reparenting task" into qt-qpr1-dev am: 4f57b5ed9c

am: 32248f52c9

Change-Id: I23f611b30374526579038dba626c39030018ec8f

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

@@ -1056,9 +1056,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
                 // removing from parent.
                 token.getParent().removeChild(token);
             }
-            if (prevDc.mLastFocus == mCurrentFocus) {
-                // The window has become the focus of this display, so it should not be notified
-                // that it lost focus from the previous display.
+            if (token.hasChild(prevDc.mLastFocus)) {
+                // If the reparent window token contains previous display's last focus window, means
+                // it will end up to gain window focus on the target display, so it should not be
+                // notified that it lost focus from the previous display.
                 prevDc.mLastFocus = null;
             }
         }