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

DO NOT MERGE Reset top focused root task when task hidden

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

Bug: 179676966
Bug: 171522827
Test: expand and minimize bubbles
Test: 1) play video
      2) adjust volume
      3) get bubble, expand it, adjust volume
      4) collapse bubble
      5) adjust volume
      => Should see volume dialog; no ANR
Change-Id: If04de21b954d074b045e76d7d23e02dade60cdbe
(cherry picked from commit a782799b15)
This commit is contained in:
Louis Chang
2021-02-20 12:49:03 +08:00
committed by Mady Mellor
parent 4d7d9c5fce
commit 78a9f28282
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -773,9 +773,10 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
onStackOrderChanged(stack); onStackOrderChanged(stack);
} }
void resetPreferredTopFocusableStackIfBelow(Task task) { /** Reset the mPreferredTopFocusableRootTask if it is or below the given task. */
void resetPreferredTopFocusableRootTaskIfNeeded(Task task) {
if (mPreferredTopFocusableStack != null if (mPreferredTopFocusableStack != null
&& mPreferredTopFocusableStack.compareTo(task) < 0) { && mPreferredTopFocusableStack.compareTo(task) <= 0) {
mPreferredTopFocusableStack = null; mPreferredTopFocusableStack = null;
} }
} }