From 78a9f2828223391664829b4f420b93f0c6fa3964 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Sat, 20 Feb 2021 12:49:03 +0800 Subject: [PATCH] DO NOT MERGE Reset top focused root task when task hidden 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 a782799b15323c9c8475e62a8dfd8f6fedb66b75) --- services/core/java/com/android/server/wm/Task.java | 10 +++++----- .../java/com/android/server/wm/TaskDisplayArea.java | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index db3c74fc94af9..b19b8c1ce10b7 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -4597,11 +4597,11 @@ class Task extends WindowContainer { } final boolean wasHidden = isForceHidden(); mForceHiddenFlags = newFlags; - if (wasHidden && isFocusableAndVisible()) { - // The change in force-hidden state will change visibility without triggering a stack - // order change, so we should reset the preferred top focusable stack to ensure it's not - // used if a new activity is started from this task. - getDisplayArea().resetPreferredTopFocusableStackIfBelow(this); + 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().resetPreferredTopFocusableRootTaskIfNeeded(this); } return true; } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 79f3b8340b214..676d7e5071417 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -773,9 +773,10 @@ final class TaskDisplayArea extends DisplayArea { onStackOrderChanged(stack); } - void resetPreferredTopFocusableStackIfBelow(Task task) { + /** Reset the mPreferredTopFocusableRootTask if it is or below the given task. */ + void resetPreferredTopFocusableRootTaskIfNeeded(Task task) { if (mPreferredTopFocusableStack != null - && mPreferredTopFocusableStack.compareTo(task) < 0) { + && mPreferredTopFocusableStack.compareTo(task) <= 0) { mPreferredTopFocusableStack = null; } }