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

Avoid activity positioned on top of always-on-top activities

Browse Source 
An activity was positioned on top of the Task while Task#addChild()
called when the activity was started, regardless there are other
always-on-top activities in the Task.

There isn't an issue because the activity will be positioned below
the always-on-top activity later when `task.positionChildAtTop(r)`
is called (after the activity added to the Task).

Bug: 181721787
Test: atest StartActivityTests#testStartActivitiesTaskOverlayStayOnTop
Change-Id: If166b866acd7aed4efce90a65b994b60bfa504c2
This commit is contained in:
Louis Chang
2021-06-15 15:00:30 +08:00
parent 2bf128ac52
commit 9d1f25a3bd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2420,17 +2420,16 @@ class Task extends TaskFragment {
// Figure-out min/max possible position depending on if child can show for current user.
int minPosition = (canShowChild) ? computeMinUserPosition(0, size) : 0;
int maxPosition = (canShowChild) ? size - 1 : computeMaxUserPosition(size - 1);
if (!hasChild(wc)) {
// Increase the maxPosition because children size will grow once wc is added.
++maxPosition;
int maxPosition = minPosition;
if (size > 0) {
maxPosition = (canShowChild) ? size - 1 : computeMaxUserPosition(size - 1);
}
// Factor in always-on-top children in max possible position.
if (!wc.isAlwaysOnTop()) {
// We want to place all non-always-on-top containers below always-on-top ones.
while (maxPosition > minPosition) {
if (!mChildren.get(maxPosition - 1).isAlwaysOnTop()) break;
if (!mChildren.get(maxPosition).isAlwaysOnTop()) break;
--maxPosition;
}
}
@@ -2441,6 +2440,12 @@ class Task extends TaskFragment {
} else if (suggestedPosition == POSITION_TOP && maxPosition >= (size - 1)) {
return POSITION_TOP;
}
// Increase the maxPosition because children size will grow once wc is added.
if (!hasChild(wc)) {
++maxPosition;
}
// Reset position based on minimum/maximum possible positions.
return Math.min(Math.max(suggestedPosition, minPosition), maxPosition);
}