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

Exclude the ActivityStack when processing the reset of a task

Browse Source 
When processing the reset of task by ResetTargetTaskHelper, we should
prevent to process task with ActivityStack case. This CL exclude the
root task(ActivityStack) when execute the processing the reset of a task.

Bug: 148590003
Test: atest WmTests:ActivityStackTests
      atest WmTests:TaskTests
      atest WmTests:ActivityRecordTests

Change-Id: I63ed4c2d87f7844fc05c6f61434a0923f2ed3d21
This commit is contained in:
Jeff Chang
2020-02-11 14:57:34 +08:00
parent d9e45183cb
commit dc9c1d4192
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ResetTargetTaskHelper.java
View File

@@ -67,7 +67,7 @@ class ResetTargetTaskHelper {
final PooledConsumer c = PooledLambda.obtainConsumer(
ResetTargetTaskHelper::processTask, this, PooledLambda.__(Task.class));
targetTask.mWmService.mRoot.forAllTasks(c);
targetTask.mWmService.mRoot.forAllTasks(c, true /*traverseTopToBottom*/, mTargetStack);
c.recycle();
processPendingReparentActivities();

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

@@ -3064,17 +3064,11 @@ class Task extends WindowContainer<WindowContainer> {
return matchParentBounds();
}
@Override
void forAllTasks(Consumer<Task> callback, boolean traverseTopToBottom, Task excludedTask) {
if (traverseTopToBottom) {
super.forAllTasks(callback, traverseTopToBottom);
if (excludedTask != this) {
callback.accept(this);
}
} else {
super.forAllTasks(callback, traverseTopToBottom);
if (excludedTask != this) {
callback.accept(this);
}
super.forAllTasks(callback, traverseTopToBottom, excludedTask);
if (excludedTask != this) {
callback.accept(this);
}
}

13
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -1425,6 +1425,19 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
}
}
void forAllTasks(Consumer<Task> callback, boolean traverseTopToBottom, Task excludedTask) {
final int count = mChildren.size();
if (traverseTopToBottom) {
for (int i = count - 1; i >= 0; --i) {
mChildren.get(i).forAllTasks(callback, traverseTopToBottom, excludedTask);
}
} else {
for (int i = 0; i < count; i++) {
mChildren.get(i).forAllTasks(callback, traverseTopToBottom, excludedTask);
}
}
}
Task getTaskAbove(Task t) {
return getTask(
(above) -> true, t, false /*includeBoundary*/, false /*traverseTopToBottom*/);