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

Merge "Rename Stack to Task related terms (5/n)"

Browse Source
This commit is contained in:
Louis Chang
2021-01-13 07:56:43 +00:00
committed by Android (Google) Code Review
parent 8102d73d57 8011a6a0b1
commit 3275f07a82
6 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/EventLogTags.logtags
View File

@@ -10,8 +10,6 @@ option java_package android.app
# The activity's onResume has been called.
30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3)
# Attempting to stop an activity
30048 wm_stop_activity (User|1|5),(Token|1|5),(Component Name|3)
# The activity's onStop has been called.
30049 wm_on_stop_called (Token|1|5),(Component Name|3),(Reason|3)
@@ -31,6 +29,3 @@ option java_package android.app
# The activity's onTopResumedActivityChanged(false) has been called.
30065 wm_on_top_resumed_lost_called (Token|1|5),(Component Name|3),(Reason|3)
# An activity been add into stopping list
30066 wm_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3)

37
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -3024,7 +3024,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
public void dump(PrintWriter pw, String prefix, boolean dumpAll) {
super.dump(pw, prefix, dumpAll);
pw.print(prefix);
pw.println("Display: mDisplayId=" + mDisplayId + " stacks=" + getRootTaskCount());
pw.println("Display: mDisplayId=" + mDisplayId + " rootTasks=" + getRootTaskCount());
final String subPrefix = " " + prefix;
pw.print(subPrefix); pw.print("init="); pw.print(mInitialDisplayWidth); pw.print("x");
pw.print(mInitialDisplayHeight); pw.print(" "); pw.print(mInitialDisplayDensity);
@@ -3107,30 +3107,31 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
pw.println();
// Dump stack references
final Task homeStack = getDefaultTaskDisplayArea().getRootHomeTask();
if (homeStack != null) {
pw.println(prefix + "homeStack=" + homeStack.getName());
// Dump root task references
final Task rootHomeTask = getDefaultTaskDisplayArea().getRootHomeTask();
if (rootHomeTask != null) {
pw.println(prefix + "rootHomeTask=" + rootHomeTask.getName());
}
final Task pinnedStack = getDefaultTaskDisplayArea().getRootPinnedTask();
if (pinnedStack != null) {
pw.println(prefix + "pinnedStack=" + pinnedStack.getName());
final Task rootPinnedTask = getDefaultTaskDisplayArea().getRootPinnedTask();
if (rootPinnedTask != null) {
pw.println(prefix + "rootPinnedTask=" + rootPinnedTask.getName());
}
final Task splitScreenPrimaryStack = getDefaultTaskDisplayArea()
final Task rootSplitScreenPrimaryTask = getDefaultTaskDisplayArea()
.getRootSplitScreenPrimaryTask();
if (splitScreenPrimaryStack != null) {
pw.println(prefix + "splitScreenPrimaryStack=" + splitScreenPrimaryStack.getName());
if (rootSplitScreenPrimaryTask != null) {
pw.println(
prefix + "rootSplitScreenPrimaryTask=" + rootSplitScreenPrimaryTask.getName());
}
// TODO: Support recents on non-default task containers
final Task recentsStack = getDefaultTaskDisplayArea().getRootTask(
final Task rootRecentsTask = getDefaultTaskDisplayArea().getRootTask(
WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_RECENTS);
if (recentsStack != null) {
pw.println(prefix + "recentsStack=" + recentsStack.getName());
if (rootRecentsTask != null) {
pw.println(prefix + "rootRecentsTask=" + rootRecentsTask.getName());
}
final Task dreamStack =
final Task rootDreamTask =
getRootTask(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_DREAM);
if (dreamStack != null) {
pw.println(prefix + "dreamStack=" + dreamStack.getName());
if (rootDreamTask != null) {
pw.println(prefix + "rootDreamTask=" + rootDreamTask.getName());
}
pw.println();
@@ -3150,7 +3151,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
@Override
public String toString() {
return "Display " + mDisplayId + " info=" + mDisplayInfo + " stacks=" + mChildren;
return "Display " + mDisplayId + " info=" + mDisplayInfo + " rootTasks=" + mChildren;
}
String getName() {

20
services/core/java/com/android/server/wm/EventLogTags.logtags
View File

@@ -35,22 +35,18 @@ option java_package com.android.server.wm
30019 wm_relaunch_resume_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3)
# An activity has been relaunched:
30020 wm_relaunch_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3)
# The activity's onPause has been called.
30021 wm_on_paused_called (Token|1|5),(Component Name|3),(Reason|3)
# The activity's onResume has been called.
30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3)
# Activity set to resumed
30043 wm_set_resumed_activity (User|1|5),(Component Name|3),(Reason|3)
# Stack focus
30044 wm_focused_stack (User|1|5),(Display Id|1|5),(Focused Stack Id|1|5),(Last Focused Stack Id|1|5),(Reason|3)
# Root task focus
30044 wm_focused_root_task (User|1|5),(Display Id|1|5),(Focused Root Task Id|1|5),(Last Focused Root Task Id|1|5),(Reason|3)
# Attempting to stop an activity
30048 wm_stop_activity (User|1|5),(Token|1|5),(Component Name|3)
# The task is being removed from its parent stack
30061 wm_remove_task (Task ID|1|5), (Stack ID|1|5)
# The task is being removed from its parent task
30061 wm_remove_task (Task ID|1|5), (Root Task ID|1|5)
# An activity been add into stopping list
30066 wm_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3)
@@ -61,17 +57,11 @@ option java_package com.android.server.wm
# Out of memory for surfaces.
31000 wm_no_surface_memory (Window|3),(PID|1|5),(Operation|3)
# Task created.
31001 wm_task_created (TaskId|1|5),(StackId|1|5)
31001 wm_task_created (TaskId|1|5),(RootTaskId|1|5)
# Task moved to top (1) or bottom (0).
31002 wm_task_moved (TaskId|1|5),(ToTop|1),(Index|1)
# Task removed with source explanation.
31003 wm_task_removed (TaskId|1|5),(Reason|3)
# Stack created.
31004 wm_stack_created (StackId|1|5)
# Home stack moved to top (1) or bottom (0).
31005 wm_home_stack_moved (ToTop|1)
# Stack removed.
31006 wm_stack_removed (StackId|1|5)
# bootanim finished:
31007 wm_boot_animation_done (time|2|3)

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

@@ -3572,7 +3572,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
public void dump(PrintWriter pw, String prefix, boolean dumpAll) {
super.dump(pw, prefix, dumpAll);
pw.print(prefix);
pw.println("topDisplayFocusedStack=" + getTopDisplayFocusedRootTask());
pw.println("topDisplayFocusedRootTask=" + getTopDisplayFocusedRootTask());
for (int i = getChildCount() - 1; i >= 0; --i) {
final DisplayContent display = getChildAt(i);
display.dump(pw, prefix, dumpAll);

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

@@ -1407,7 +1407,6 @@ class Task extends WindowContainer<WindowContainer> {
// from the display, so we should probably consolidate it there instead.
if (getParent() == null && mDisplayContent != null) {
EventLogTags.writeWmStackRemoved(getRootTaskId());
mDisplayContent = null;
mWmService.mWindowPlacerLocked.requestTraversal();
}
@@ -4413,7 +4412,8 @@ class Task extends WindowContainer<WindowContainer> {
if (mRootProcess != null) {
pw.print(prefix); pw.print("mRootProcess="); pw.println(mRootProcess);
}
pw.print(prefix); pw.print("taskId=" + mTaskId); pw.println(" stackId=" + getRootTaskId());
pw.print(prefix); pw.print("taskId=" + mTaskId);
pw.println(" rootTaskId=" + getRootTaskId());
pw.print(prefix); pw.print("mHasBeenVisible="); pw.println(getHasBeenVisible());
pw.print(prefix); pw.print("mResizeMode=");
pw.print(ActivityInfo.resizeModeToString(mResizeMode));
@@ -7159,7 +7159,7 @@ class Task extends WindowContainer<WindowContainer> {
if (needSep) {
pw.println();
}
pw.println(" Stack #" + getRootTaskId()
pw.println(" RootTask #" + getRootTaskId()
+ ": type=" + activityTypeToString(getActivityType())
+ " mode=" + windowingModeToString(getWindowingMode()));
pw.println(" isSleeping=" + shouldSleepActivities());

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

@@ -1259,7 +1259,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
}
mLastFocusedRootTask = prevFocusedTask;
EventLogTags.writeWmFocusedStack(mRootWindowContainer.mCurrentUser,
EventLogTags.writeWmFocusedRootTask(mRootWindowContainer.mCurrentUser,
mDisplayContent.mDisplayId,
currentFocusedTask == null ? -1 : currentFocusedTask.getRootTaskId(),
mLastFocusedRootTask == null ? -1 : mLastFocusedRootTask.getRootTaskId(),