Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba19c63b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear preferred top focusable root task" into sc-dev

parents f76ad952 b7cd0183

services/core/java/com/android/server/wm/Task.java

+5 −0
Original line number Diff line number Diff line
@@ -3071,6 +3071,11 @@ class Task extends WindowContainer<WindowContainer> { 
            focusableTask = mRootWindowContainer.getNextFocusableRootTask(this, !allowFocusSelf);

        }

        if (focusableTask == null) {

            final TaskDisplayArea taskDisplayArea = getDisplayArea();

            if (taskDisplayArea != null) {

                // Clear the recorded task since there is no next focusable task.

                taskDisplayArea.clearPreferredTopFocusableRootTask();

            }

            return null;

        }

services/core/java/com/android/server/wm/TaskDisplayArea.java

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
     * unable to resume target root task properly when there are other focusable always-on-top

     * root tasks.

     */

    @VisibleForTesting

    Task mPreferredTopFocusableRootTask;



    /**
@@ -2130,6 +2131,10 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
                && mDisplayContent.getOrientationRequestingTaskDisplayArea() == this;

    }



    void clearPreferredTopFocusableRootTask() {

        mPreferredTopFocusableRootTask = null;

    }



    @Override

    boolean isTaskDisplayArea() {

        return true;