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

Reset top focused root task when task hidden

Browse Source 
The focused app was not updated when bubble minimized and causing
ANR.

Bug: 179676966
Test: expand and minimize bubbles
Change-Id: If04de21b954d074b045e76d7d23e02dade60cdbe
This commit is contained in:
Louis Chang
2021-02-20 12:49:03 +08:00
parent a06569676e
commit a782799b15
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/Task.java
View File

@@ -5373,11 +5373,11 @@ class Task extends WindowContainer<WindowContainer> {
}
final boolean wasHidden = isForceHidden();
mForceHiddenFlags = newFlags;
if (wasHidden && isFocusableAndVisible()) {
if (wasHidden != isForceHidden() && isTopActivityFocusable()) {
// The change in force-hidden state will change visibility without triggering a root
// task order change, so we should reset the preferred top focusable root task to ensure
// it's not used if a new activity is started from this task.
getDisplayArea().resetPreferredTopFocusableRootTaskIfBelow(this);
getDisplayArea().resetPreferredTopFocusableRootTaskIfNeeded(this);
}
return true;
}

5
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -974,9 +974,10 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
onRootTaskOrderChanged(rootTask);
}
void resetPreferredTopFocusableRootTaskIfBelow(Task task) {
/** Reset the mPreferredTopFocusableRootTask if it is or below the given task. */
void resetPreferredTopFocusableRootTaskIfNeeded(Task task) {
if (mPreferredTopFocusableRootTask != null
&& mPreferredTopFocusableRootTask.compareTo(task) < 0) {
&& mPreferredTopFocusableRootTask.compareTo(task) <= 0) {
mPreferredTopFocusableRootTask = null;
}
}