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

Commit b5ce37ce authored by Winson Chung's avatar Winson Chung
Browse files

Reset the preferred top focus stack when task visibility changes 

- The change in visibility of a task does not always trigger a
  stack order change, which won't trigger the previously set
  top focus stack to be reset for the next activity launch.

Bug: 154658401
Test: Verify we don't regress on b/112084174, and open an activity
      from a bubbled task
Change-Id: I8770448b3ac40c384e8e93ca7ee37f1f8aa80cf4
parent 9f9ffca0

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

+0 −10
Original line number Diff line number Diff line
@@ -1010,16 +1010,6 @@ class ActivityStack extends Task { 
        }

    }



    boolean isTopActivityFocusable() {

        final ActivityRecord r = topRunningActivity();

        return r != null ? r.isFocusable()

                : (isFocusable() && getWindowConfiguration().canReceiveKeys());

    }



    boolean isFocusableAndVisible() {

        return isTopActivityFocusable() && shouldBeVisible(null /* starting */);

    }



    // TODO: Should each user have there own stacks?

    @Override

    void switchUser(int userId) {

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

+17 −0
Original line number Diff line number Diff line
@@ -3331,6 +3331,16 @@ class Task extends WindowContainer<WindowContainer> { 
        });

    }



    boolean isTopActivityFocusable() {

        final ActivityRecord r = topRunningActivity();

        return r != null ? r.isFocusable()

                : (isFocusable() && getWindowConfiguration().canReceiveKeys());

    }



    boolean isFocusableAndVisible() {

        return isTopActivityFocusable() && shouldBeVisible(null /* starting */);

    }



    void positionChildAtTop(ActivityRecord child) {

        positionChildAt(child, POSITION_TOP);

    }
@@ -4626,7 +4636,14 @@ class Task extends WindowContainer<WindowContainer> { 
        if (mForceHiddenFlags == newFlags) {

            return false;

        }

        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);

        }

        return true;

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -680,6 +680,13 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { 
        onStackOrderChanged(stack);

    }



    void resetPreferredTopFocusableStackIfBelow(Task task) {

        if (mPreferredTopFocusableStack != null

                && mPreferredTopFocusableStack.compareTo(task) < 0) {

            mPreferredTopFocusableStack = null;

        }

    }



    void positionStackAt(int position, ActivityStack child, boolean includingParents) {

        positionChildAt(position, child, includingParents);

        mDisplayContent.layoutAndAssignWindowLayersIfNeeded();