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

Merge "Add log about adding hidden task"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-08 07:51:10 +00:00
committed by Android (Google) Code Review
parent 34d046842d 0812325d3d
commit 1a2fc0f447
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/RecentTasks.java
View File

@@ -1496,6 +1496,7 @@ class RecentTasks {
final Task removedTask = mTasks.remove(removeIndex);
if (removedTask != task) {
if (removedTask.hasChild()) {
Slog.i(TAG, "Add " + removedTask + " to hidden list because adding " + task);
// A non-empty task is replaced by a new task. Because the removed task is no longer
// managed by the recent tasks list, add it to the hidden list to prevent the task
// from becoming dangling.

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

@@ -4421,8 +4421,17 @@ class Task extends WindowContainer<WindowContainer> {
sb.append(stringName);
sb.append(" U=");
sb.append(mUserId);
sb.append(" StackId=");
sb.append(getRootTaskId());
final Task rootTask = getRootTask();
if (rootTask != this) {
sb.append(" rootTaskId=");
sb.append(rootTask.mTaskId);
}
sb.append(" visible=");
sb.append(shouldBeVisible(null /* starting */));
sb.append(" mode=");
sb.append(windowingModeToString(getWindowingMode()));
sb.append(" translucent=");
sb.append(isTranslucent(null /* starting */));
sb.append(" sz=");
sb.append(getChildCount());
sb.append('}');
@@ -4432,10 +4441,7 @@ class Task extends WindowContainer<WindowContainer> {
sb.append(Integer.toHexString(System.identityHashCode(this)));
sb.append(" #");
sb.append(mTaskId);
sb.append(" visible=" + shouldBeVisible(null /* starting */));
sb.append(" type=" + activityTypeToString(getActivityType()));
sb.append(" mode=" + windowingModeToString(getWindowingMode()));
sb.append(" translucent=" + isTranslucent(null /* starting */));
if (affinity != null) {
sb.append(" A=");
sb.append(affinity);
@@ -5180,9 +5186,6 @@ class Task extends WindowContainer<WindowContainer> {
@Override
public void setWindowingMode(int windowingMode) {
// Reset the cached result of toString()
stringName = null;
// Calling Task#setWindowingMode() for leaf task since this is the a specialization of
// {@link #setWindowingMode(int)} for ActivityStack.
if (!isRootTask()) {