Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4f57b5ed9c

Change-Id: I561e5f615f41738439610bfc4aa34afd5b5ff828
This commit is contained in:
lumark
2019-09-11 12:58:54 -07:00
committed by android-build-merger
parent c21292127e 4f57b5ed9c
commit 32248f52c9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1072,9 +1072,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
// removing from parent. // removing from parent.
token.getParent().removeChild(token); token.getParent().removeChild(token);
} }
if (prevDc.mLastFocus == mCurrentFocus) { if (token.hasChild(prevDc.mLastFocus)) {
// The window has become the focus of this display, so it should not be notified // If the reparent window token contains previous display's last focus window, means
// that it lost focus from the previous display. // 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; prevDc.mLastFocus = null;
} }
} }