diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskDisplayArea.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index d36091623207..d60b6e0ef81d 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -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; } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 40248c43fe5d..badd7fda2897 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -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; } } |