Merge RootActivityContainer and RootWindowContainer (85/n)
Bug: 80414790
Test: Existing tests pass
Change-Id: Ica2917099b09e6c091100401645ffcdfff761aa5
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 6f80feb..ac1dbc4 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -117,8 +117,8 @@
import static com.android.server.wm.ActivityTaskManagerService.UiHandler.DISMISS_DIALOG_UI_MSG;
import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE;
import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;
-import static com.android.server.wm.RootActivityContainer.MATCH_TASK_IN_STACKS_ONLY;
-import static com.android.server.wm.RootActivityContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS;
+import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_ONLY;
+import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS;
import static com.android.server.wm.Task.LOCK_TASK_AUTH_DONT_LOCK;
import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT;
import static com.android.server.wm.Task.REPARENT_LEAVE_STACK_IN_PLACE;
@@ -376,7 +376,7 @@
*/
final Object mGlobalLockWithoutBoost = mGlobalLock;
ActivityStackSupervisor mStackSupervisor;
- RootActivityContainer mRootActivityContainer;
+ RootWindowContainer mRootWindowContainer;
WindowManagerService mWindowManager;
private UserManagerService mUserManager;
private AppOpsService mAppOpsService;
@@ -862,15 +862,14 @@
public void setWindowManager(WindowManagerService wm) {
synchronized (mGlobalLock) {
mWindowManager = wm;
- // TODO(merge-root): Remove cast
- mRootActivityContainer = (RootActivityContainer) wm.mRoot;
+ mRootWindowContainer = wm.mRoot;
mTempConfig.setToDefaults();
mTempConfig.setLocales(LocaleList.getDefault());
mConfigurationSeq = mTempConfig.seq = 1;
- mRootActivityContainer.onConfigurationChanged(mTempConfig);
+ mRootWindowContainer.onConfigurationChanged(mTempConfig);
mLockTaskController.setWindowManager(wm);
mStackSupervisor.setWindowManager(wm);
- mRootActivityContainer.setWindowManager(wm);
+ mRootWindowContainer.setWindowManager(wm);
}
}
@@ -1341,7 +1340,7 @@
sourceToken = resultTo;
}
- sourceRecord = mRootActivityContainer.isInAnyStack(sourceToken);
+ sourceRecord = mRootWindowContainer.isInAnyStack(sourceToken);
if (sourceRecord == null) {
throw new SecurityException("Called with bad activity token: " + sourceToken);
}
@@ -2021,7 +2020,7 @@
public void notifyActivityDrawn(IBinder token) {
if (DEBUG_VISIBILITY) Slog.d(TAG_VISIBILITY, "notifyActivityDrawn: token=" + token);
synchronized (mGlobalLock) {
- ActivityRecord r = mRootActivityContainer.isInAnyStack(token);
+ ActivityRecord r = mRootWindowContainer.isInAnyStack(token);
if (r != null) {
r.getActivityStack().notifyActivityDrawnLocked(r);
}
@@ -2058,7 +2057,7 @@
synchronized (mGlobalLock) {
ActivityStack focusedStack = getTopDisplayFocusedStack();
if (focusedStack != null) {
- return mRootActivityContainer.getStackInfo(focusedStack.mStackId);
+ return mRootWindowContainer.getStackInfo(focusedStack.mStackId);
}
return null;
}
@@ -2074,14 +2073,14 @@
final long callingId = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
Slog.w(TAG, "setFocusedStack: No stack with id=" + stackId);
return;
}
final ActivityRecord r = stack.topRunningActivity();
if (r != null && r.moveFocusableActivityToTop("setFocusedStack")) {
- mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mRootWindowContainer.resumeFocusedStacksTopActivities();
}
}
} finally {
@@ -2096,14 +2095,14 @@
final long callingId = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
return;
}
final ActivityRecord r = task.topRunningActivityLocked();
if (r != null && r.moveFocusableActivityToTop("setFocusedTask")) {
- mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mRootWindowContainer.resumeFocusedStacksTopActivities();
}
}
} finally {
@@ -2206,7 +2205,7 @@
final long origId = Binder.clearCallingIdentity();
try {
int taskId = ActivityRecord.getTaskForActivityLocked(token, !nonRoot);
- final Task task = mRootActivityContainer.anyTaskForId(taskId);
+ final Task task = mRootWindowContainer.anyTaskForId(taskId);
if (task != null) {
return ActivityRecord.getStackLocked(token).moveTaskToBack(task);
}
@@ -2224,7 +2223,7 @@
Rect rect = new Rect();
try {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);
if (task == null) {
Slog.w(TAG, "getTaskBounds: taskId=" + taskId + " not found");
@@ -2247,7 +2246,7 @@
synchronized (mGlobalLock) {
enforceCallerIsRecentsOrHasPermission(
MANAGE_ACTIVITY_STACKS, "getTaskDescription()");
- final Task tr = mRootActivityContainer.anyTaskForId(id,
+ final Task tr = mRootWindowContainer.anyTaskForId(id,
MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);
if (tr != null) {
return tr.getTaskDescription();
@@ -2267,7 +2266,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
Slog.w(TAG, "setTaskWindowingMode: No task for id=" + taskId);
@@ -2403,7 +2402,7 @@
}
}
try {
- final Task task = mRootActivityContainer.anyTaskForId(taskId);
+ final Task task = mRootWindowContainer.anyTaskForId(taskId);
if (task == null) {
Slog.d(TAG, "Could not find task for id: "+ taskId);
SafeActivityOptions.abort(options);
@@ -2547,7 +2546,7 @@
if (DEBUG_ALL) Slog.v(TAG, "getTasks: max=" + maxNum);
final boolean allowed = isGetTasksAllowed("getTasks", callingPid, callingUid);
- mRootActivityContainer.getRunningTasks(maxNum, list, ignoreActivityType,
+ mRootWindowContainer.getRunningTasks(maxNum, list, ignoreActivityType,
ignoreWindowingMode, callingUid, allowed, crossUser, callingProfileIds);
}
@@ -2594,7 +2593,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- final Task task = mRootActivityContainer.anyTaskForId(taskId);
+ final Task task = mRootWindowContainer.anyTaskForId(taskId);
if (task == null) {
Slog.w(TAG, "moveTaskToStack: No task for id=" + taskId);
return;
@@ -2603,7 +2602,7 @@
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveTaskToStack: moving task=" + taskId
+ " to stackId=" + stackId + " toTop=" + toTop);
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
throw new IllegalStateException(
"moveTaskToStack: No stack for stackId=" + stackId);
@@ -2631,7 +2630,7 @@
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
Slog.w(TAG, "resizeStack: stackId " + stackId + " not found.");
return;
@@ -2659,7 +2658,7 @@
if (xOffset == 0 && yOffset == 0) {
return;
}
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
Slog.w(TAG, "offsetPinnedStackBounds: stackId " + stackId + " not found.");
return;
@@ -2706,7 +2705,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
Slog.w(TAG, "setTaskWindowingModeSplitScreenPrimary: No task for id=" + taskId);
@@ -2748,7 +2747,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- mRootActivityContainer.removeStacksInWindowingModes(windowingModes);
+ mRootWindowContainer.removeStacksInWindowingModes(windowingModes);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -2763,7 +2762,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- mRootActivityContainer.removeStacksWithActivityTypes(activityTypes);
+ mRootWindowContainer.removeStacksWithActivityTypes(activityTypes);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -2794,7 +2793,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- return mRootActivityContainer.getAllStackInfos(INVALID_DISPLAY);
+ return mRootWindowContainer.getAllStackInfos(INVALID_DISPLAY);
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -2807,7 +2806,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- return mRootActivityContainer.getStackInfo(windowingMode, activityType);
+ return mRootWindowContainer.getStackInfo(windowingMode, activityType);
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -2820,7 +2819,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- return mRootActivityContainer.getAllStackInfos(displayId);
+ return mRootWindowContainer.getAllStackInfos(displayId);
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -2834,7 +2833,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- return mRootActivityContainer.getStackInfo(windowingMode, activityType, displayId);
+ return mRootWindowContainer.getStackInfo(windowingMode, activityType, displayId);
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -2876,7 +2875,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
return;
@@ -2918,7 +2917,7 @@
return;
}
- final ActivityStack stack = mRootActivityContainer.getTopDisplayFocusedStack();
+ final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack();
if (stack == null || task != stack.getTopMostTask()) {
throw new IllegalArgumentException("Invalid task, not in foreground");
}
@@ -2933,7 +2932,7 @@
long ident = Binder.clearCallingIdentity();
try {
// When a task is locked, dismiss the pinned stack if it exists
- mRootActivityContainer.removeStacksInWindowingModes(WINDOWING_MODE_PINNED);
+ mRootWindowContainer.removeStacksInWindowingModes(WINDOWING_MODE_PINNED);
getLockTaskController().startLockTaskMode(task, isSystemCaller, callingUid);
} finally {
@@ -3035,7 +3034,7 @@
try {
// TODO: VI Consider treating local voice interactions and voice tasks
// differently here
- mRootActivityContainer.finishVoiceTask(session);
+ mRootWindowContainer.finishVoiceTask(session);
} finally {
Binder.restoreCallingIdentity(origId);
}
@@ -3230,7 +3229,7 @@
@Override
public void setTaskResizeable(int taskId, int resizeableMode) {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(
+ final Task task = mRootWindowContainer.anyTaskForId(
taskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);
if (task == null) {
Slog.w(TAG, "setTaskResizeable: taskId=" + taskId + " not found");
@@ -3246,7 +3245,7 @@
long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
Slog.w(TAG, "resizeTask: taskId=" + taskId + " not found");
@@ -3438,7 +3437,7 @@
synchronized (mGlobalLock) {
final long ident = Binder.clearCallingIdentity();
try {
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
Slog.w(TAG, "removeStack: No stack with id=" + stackId);
return;
@@ -3463,7 +3462,7 @@
try {
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveStackToDisplay: moving stackId=" + stackId
+ " to displayId=" + displayId);
- mRootActivityContainer.moveStackToDisplay(stackId, displayId, ON_TOP);
+ mRootWindowContainer.moveStackToDisplay(stackId, displayId, ON_TOP);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -3949,13 +3948,13 @@
try {
if (DEBUG_STACK) Slog.d(TAG_STACK, "positionTaskInStack: positioning task="
+ taskId + " in stackId=" + stackId + " at position=" + position);
- final Task task = mRootActivityContainer.anyTaskForId(taskId);
+ final Task task = mRootWindowContainer.anyTaskForId(taskId);
if (task == null) {
throw new IllegalArgumentException("positionTaskInStack: no task for id="
+ taskId);
}
- final ActivityStack stack = mRootActivityContainer.getStack(stackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(stackId);
if (stack == null) {
throw new IllegalArgumentException("positionTaskInStack: no stack for id="
@@ -4011,7 +4010,7 @@
try {
synchronized (mGlobalLock) {
final ActivityStack stack =
- mRootActivityContainer.getDefaultDisplay().getSplitScreenPrimaryStack();
+ mRootWindowContainer.getDefaultDisplay().getSplitScreenPrimaryStack();
if (stack == null) {
Slog.w(TAG, "dismissSplitScreenMode: primary split-screen stack not found.");
return;
@@ -4052,7 +4051,7 @@
try {
synchronized (mGlobalLock) {
final ActivityStack stack =
- mRootActivityContainer.getDefaultDisplay().getPinnedStack();
+ mRootWindowContainer.getDefaultDisplay().getPinnedStack();
if (stack == null) {
Slog.w(TAG, "dismissPip: pinned stack not found.");
return;
@@ -4090,7 +4089,7 @@
synchronized (mGlobalLock) {
final long origId = Binder.clearCallingIdentity();
try {
- final ActivityStack stack = mRootActivityContainer.getStack(fromStackId);
+ final ActivityStack stack = mRootWindowContainer.getStack(fromStackId);
if (stack != null){
if (!stack.isActivityTypeStandardOrUndefined()) {
throw new IllegalArgumentException(
@@ -4125,7 +4124,7 @@
long ident = Binder.clearCallingIdentity();
try {
- return mRootActivityContainer.moveTopStackActivityToPinnedStack(stackId);
+ return mRootWindowContainer.moveTopStackActivityToPinnedStack(stackId);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -4206,7 +4205,7 @@
// Adjust the source bounds by the insets for the transition down
final Rect sourceBounds = new Rect(
r.pictureInPictureArgs.getSourceRectHint());
- mRootActivityContainer.moveActivityToPinnedStack(
+ mRootWindowContainer.moveActivityToPinnedStack(
r, sourceBounds, aspectRatio, "enterPictureInPictureMode");
final ActivityStack stack = r.getActivityStack();
stack.setPictureInPictureAspectRatio(aspectRatio);
@@ -4538,7 +4537,7 @@
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId,
+ final Task task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_ONLY);
if (task == null) {
Slog.w(TAG, "cancelTaskWindowTransition: taskId=" + taskId + " not found");
@@ -4566,7 +4565,7 @@
boolean restoreFromDisk) {
final Task task;
synchronized (mGlobalLock) {
- task = mRootActivityContainer.anyTaskForId(taskId,
+ task = mRootWindowContainer.anyTaskForId(taskId,
MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);
if (task == null) {
Slog.w(TAG, "getTaskSnapshot: taskId=" + taskId + " not found");
@@ -4743,7 +4742,7 @@
"registerRemoteAnimations");
definition.setCallingPidUid(Binder.getCallingPid(), Binder.getCallingUid());
synchronized (mGlobalLock) {
- final DisplayContent display = mRootActivityContainer.getDisplayContent(displayId);
+ final DisplayContent display = mRootWindowContainer.getDisplayContent(displayId);
if (display == null) {
Slog.e(TAG, "Couldn't find display with id: " + displayId);
return;
@@ -4849,7 +4848,7 @@
if (r.requestedVrComponent != null && r.getDisplayId() != DEFAULT_DISPLAY) {
Slog.i(TAG, "Moving " + r.shortComponentName + " from display " + r.getDisplayId()
+ " to main display for VR");
- mRootActivityContainer.moveStackToDisplay(
+ mRootWindowContainer.moveStackToDisplay(
r.getStackId(), DEFAULT_DISPLAY, true /* toTop */);
}
mH.post(() -> {
@@ -4862,7 +4861,7 @@
if (disableNonVrUi) {
// If we are in a VR mode where Picture-in-Picture mode is unsupported,
// then remove the pinned stack.
- mRootActivityContainer.removeStacksInWindowingModes(WINDOWING_MODE_PINNED);
+ mRootWindowContainer.removeStacksInWindowingModes(WINDOWING_MODE_PINNED);
}
}
});
@@ -4914,7 +4913,7 @@
}
ActivityStack getTopDisplayFocusedStack() {
- return mRootActivityContainer.getTopDisplayFocusedStack();
+ return mRootWindowContainer.getTopDisplayFocusedStack();
}
/** Pokes the task persister. */
@@ -4952,7 +4951,7 @@
final long origId = Binder.clearCallingIdentity();
try {
final DisplayContent display =
- mRootActivityContainer.getDisplayContentOrCreate(displayId);
+ mRootWindowContainer.getDisplayContentOrCreate(displayId);
if (display != null) {
display.setDisplayToSingleTaskInstance();
}
@@ -5048,12 +5047,12 @@
int opti, boolean dumpAll, boolean dumpClient, String dumpPackage, String header) {
pw.println(header);
- boolean printedAnything = mRootActivityContainer.dumpActivities(fd, pw, dumpAll, dumpClient,
+ boolean printedAnything = mRootWindowContainer.dumpActivities(fd, pw, dumpAll, dumpClient,
dumpPackage);
boolean needSep = printedAnything;
boolean printed = ActivityStackSupervisor.printThisActivity(pw,
- mRootActivityContainer.getTopResumedActivity(), dumpPackage, needSep,
+ mRootWindowContainer.getTopResumedActivity(), dumpPackage, needSep,
" ResumedActivity: ");
if (printed) {
printedAnything = true;
@@ -5075,7 +5074,7 @@
void dumpActivityContainersLocked(PrintWriter pw) {
pw.println("ACTIVITY MANAGER CONTAINERS (dumpsys activity containers)");
- mRootActivityContainer.dumpChildrenNames(pw, " ");
+ mRootWindowContainer.dumpChildrenNames(pw, " ");
pw.println(" ");
}
@@ -5102,7 +5101,7 @@
ArrayList<ActivityRecord> activities;
synchronized (mGlobalLock) {
- activities = mRootActivityContainer.getDumpActivities(name, dumpVisibleStacksOnly,
+ activities = mRootWindowContainer.getDumpActivities(name, dumpVisibleStacksOnly,
dumpFocusedStackOnly);
}
@@ -5180,7 +5179,7 @@
final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS);
proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS,
PowerManagerInternal.wakefulnessToProtoEnum(wakeFullness));
- for (ActivityTaskManagerInternal.SleepToken st : mRootActivityContainer.mSleepTokens) {
+ for (ActivityTaskManagerInternal.SleepToken st : mRootWindowContainer.mSleepTokens) {
proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEP_TOKENS,
st.toString());
}
@@ -5216,10 +5215,10 @@
* also corresponds to the merged configuration of the default display.
*/
Configuration getGlobalConfiguration() {
- // Return default configuration before mRootActivityContainer initialized, which happens
+ // Return default configuration before mRootWindowContainer initialized, which happens
// while initializing process record for system, see {@link
// ActivityManagerService#setSystemProcess}.
- return mRootActivityContainer != null ? mRootActivityContainer.getConfiguration()
+ return mRootWindowContainer != null ? mRootWindowContainer.getConfiguration()
: new Configuration();
}
@@ -5293,7 +5292,7 @@
boolean persistent, int userId, boolean deferResume) {
final DisplayContent defaultDisplay =
- mRootActivityContainer.getDisplayContent(DEFAULT_DISPLAY);
+ mRootWindowContainer.getDisplayContent(DEFAULT_DISPLAY);
mTempConfig.setTo(getGlobalConfiguration());
final int changes = mTempConfig.updateFrom(values);
@@ -5351,7 +5350,7 @@
mTempConfig.seq = increaseConfigurationSeqLocked();
// Update stored global config and notify everyone about the change.
- mRootActivityContainer.onConfigurationChanged(mTempConfig);
+ mRootWindowContainer.onConfigurationChanged(mTempConfig);
Slog.i(TAG, "Config changes=" + Integer.toHexString(changes) + " " + mTempConfig);
// TODO(multi-display): Update UsageEvents#Event to include displayId.
@@ -5399,7 +5398,7 @@
// Override configuration of the default display duplicates global config, so we need to
// update it also. This will also notify WindowManager about changes.
- defaultDisplay.performDisplayOverrideConfigUpdate(mRootActivityContainer.getConfiguration(),
+ defaultDisplay.performDisplayOverrideConfigUpdate(mRootWindowContainer.getConfiguration(),
deferResume);
return changes;
@@ -5549,7 +5548,7 @@
mCurAppTimeTracker.stop();
mH.obtainMessage(
REPORT_TIME_TRACKER_MSG, mCurAppTimeTracker).sendToTarget();
- mRootActivityContainer.clearOtherAppTimeTrackers(r.appTimeTracker);
+ mRootWindowContainer.clearOtherAppTimeTrackers(r.appTimeTracker);
mCurAppTimeTracker = null;
}
if (r.appTimeTracker != null) {
@@ -5611,14 +5610,14 @@
ActivityTaskManagerInternal.SleepToken acquireSleepToken(String tag, int displayId) {
synchronized (mGlobalLock) {
final ActivityTaskManagerInternal.SleepToken token =
- mRootActivityContainer.createSleepToken(tag, displayId);
+ mRootWindowContainer.createSleepToken(tag, displayId);
updateSleepIfNeededLocked();
return token;
}
}
void updateSleepIfNeededLocked() {
- final boolean shouldSleep = !mRootActivityContainer.hasAwakeDisplay();
+ final boolean shouldSleep = !mRootWindowContainer.hasAwakeDisplay();
final boolean wasSleeping = mSleeping;
boolean updateOomAdj = false;
@@ -5635,7 +5634,7 @@
Slog.d(TAG, "Top Process State changed to PROCESS_STATE_TOP");
mStackSupervisor.comeOutOfSleepIfNeededLocked();
}
- mRootActivityContainer.applySleepTokens(true /* applyToStacks */);
+ mRootWindowContainer.applySleepTokens(true /* applyToStacks */);
if (wasSleeping) {
updateOomAdj = true;
}
@@ -5848,7 +5847,7 @@
// TODO(b/111541062): Update app time tracking to make it aware of multiple resumed activities
private void startTimeTrackingFocusedActivityLocked() {
- final ActivityRecord resumedActivity = mRootActivityContainer.getTopResumedActivity();
+ final ActivityRecord resumedActivity = mRootWindowContainer.getTopResumedActivity();
if (!mSleeping && mCurAppTimeTracker != null && resumedActivity != null) {
mCurAppTimeTracker.start(resumedActivity.packageName);
}
@@ -5873,7 +5872,7 @@
/** Applies latest configuration and/or visibility updates if needed. */
boolean ensureConfigAndVisibilityAfterUpdate(ActivityRecord starting, int changes) {
boolean kept = true;
- final ActivityStack mainStack = mRootActivityContainer.getTopDisplayFocusedStack();
+ final ActivityStack mainStack = mRootWindowContainer.getTopDisplayFocusedStack();
// mainStack is null during startup.
if (mainStack != null) {
if (changes != 0 && starting == null) {
@@ -5888,7 +5887,7 @@
false /* preserveWindow */);
// And we need to make sure at this point that all other activities
// are made visible with the correct configuration.
- mRootActivityContainer.ensureActivitiesVisible(starting, changes,
+ mRootWindowContainer.ensureActivitiesVisible(starting, changes,
!PRESERVE_WINDOWS);
}
}
@@ -6173,7 +6172,7 @@
public ComponentName getHomeActivityForUser(int userId) {
synchronized (mGlobalLock) {
final ActivityRecord homeActivity =
- mRootActivityContainer.getDefaultDisplayHomeActivityForUser(userId);
+ mRootWindowContainer.getDefaultDisplayHomeActivityForUser(userId);
return homeActivity == null ? null : homeActivity.mActivityComponent;
}
}
@@ -6208,14 +6207,14 @@
@Override
public List<IBinder> getTopVisibleActivities() {
synchronized (mGlobalLock) {
- return mRootActivityContainer.getTopVisibleActivities();
+ return mRootWindowContainer.getTopVisibleActivities();
}
}
@Override
public void notifyDockedStackMinimizedChanged(boolean minimized) {
synchronized (mGlobalLock) {
- mRootActivityContainer.setDockedStackMinimized(minimized);
+ mRootWindowContainer.setDockedStackMinimized(minimized);
}
}
@@ -6300,7 +6299,7 @@
// We might change the visibilities here, so prepare an empty app transition which
// might be overridden later if we actually change visibilities.
final DisplayContent displayContent =
- mRootActivityContainer.getDisplayContent(displayId);
+ mRootWindowContainer.getDisplayContent(displayId);
if (displayContent == null) {
return;
}
@@ -6310,7 +6309,7 @@
if (!wasTransitionSet) {
dc.prepareAppTransition(TRANSIT_NONE, false /* alwaysKeepCurrent */);
}
- mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
+ mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
// If there was a transition set already we don't want to interfere with it as we
// might be starting it too early.
@@ -6327,7 +6326,7 @@
public void notifyKeyguardTrustedChanged() {
synchronized (mGlobalLock) {
if (mKeyguardController.isKeyguardShowing(DEFAULT_DISPLAY)) {
- mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
+ mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
}
}
}
@@ -6354,7 +6353,7 @@
"setFocusedActivity: No activity record matching token=" + token);
}
if (r.moveFocusableActivityToTop("setFocusedActivity")) {
- mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mRootWindowContainer.resumeFocusedStacksTopActivities();
}
}
}
@@ -6512,7 +6511,7 @@
public boolean shuttingDown(boolean booted, int timeout) {
synchronized (mGlobalLock) {
mShuttingDown = true;
- mRootActivityContainer.prepareForShutdown();
+ mRootWindowContainer.prepareForShutdown();
updateEventDispatchingLocked(booted);
notifyTaskPersisterLocked(null, true);
return mStackSupervisor.shutdownLocked(timeout);
@@ -6618,7 +6617,7 @@
@Override
public void onPackageReplaced(ApplicationInfo aInfo) {
synchronized (mGlobalLock) {
- mRootActivityContainer.updateActivityApplicationInfo(aInfo);
+ mRootWindowContainer.updateActivityApplicationInfo(aInfo);
}
}
@@ -6652,7 +6651,7 @@
}
synchronized (mGlobalLock) {
final DisplayContent displayContent =
- mRootActivityContainer.getDisplayContent(displayId);
+ mRootWindowContainer.getDisplayContent(displayId);
if (displayContent == null) {
// Call might come when display is not yet added or has been removed.
if (DEBUG_CONFIGURATION) {
@@ -6699,7 +6698,7 @@
@Override
public ActivityTokens getTopActivityForTask(int taskId) {
synchronized (mGlobalLock) {
- final Task task = mRootActivityContainer.anyTaskForId(taskId);
+ final Task task = mRootWindowContainer.anyTaskForId(taskId);
if (task == null) {
Slog.w(TAG, "getApplicationThreadForTopActivity failed:"
+ " Requested task not found");
@@ -6758,7 +6757,7 @@
@Override
public boolean startHomeActivity(int userId, String reason) {
synchronized (mGlobalLock) {
- return mRootActivityContainer.startHomeOnDisplay(userId, reason, DEFAULT_DISPLAY);
+ return mRootWindowContainer.startHomeOnDisplay(userId, reason, DEFAULT_DISPLAY);
}
}
@@ -6766,7 +6765,7 @@
public boolean startHomeOnDisplay(int userId, String reason, int displayId,
boolean allowInstrumenting, boolean fromHomeKey) {
synchronized (mGlobalLock) {
- return mRootActivityContainer.startHomeOnDisplay(userId, reason, displayId,
+ return mRootWindowContainer.startHomeOnDisplay(userId, reason, displayId,
allowInstrumenting, fromHomeKey);
}
}
@@ -6774,7 +6773,7 @@
@Override
public boolean startHomeOnAllDisplays(int userId, String reason) {
synchronized (mGlobalLock) {
- return mRootActivityContainer.startHomeOnAllDisplays(userId, reason);
+ return mRootWindowContainer.startHomeOnAllDisplays(userId, reason);
}
}
@@ -6840,7 +6839,7 @@
Runnable finishInstrumentationCallback) {
synchronized (mGlobalLockWithoutBoost) {
// Remove this application's activities from active lists.
- boolean hasVisibleActivities = mRootActivityContainer.handleAppDied(wpc);
+ boolean hasVisibleActivities = mRootWindowContainer.handleAppDied(wpc);
wpc.clearRecentTasks();
wpc.clearActivities();
@@ -6852,12 +6851,12 @@
if (!restarting && hasVisibleActivities) {
deferWindowLayout();
try {
- if (!mRootActivityContainer.resumeFocusedStacksTopActivities()) {
+ if (!mRootWindowContainer.resumeFocusedStacksTopActivities()) {
// If there was nothing to resume, and we are not already restarting
// this process, but there is a visible activity that is hosted by the
// process...then make sure all visible activities are running, taking
// care of restarting this process.
- mRootActivityContainer.ensureActivitiesVisible(null, 0,
+ mRootWindowContainer.ensureActivitiesVisible(null, 0,
!PRESERVE_WINDOWS);
}
} finally {
@@ -6888,7 +6887,7 @@
}
mWindowManager.closeSystemDialogs(reason);
- mRootActivityContainer.closeSystemDialogs();
+ mRootWindowContainer.closeSystemDialogs();
}
// Call into AM outside the synchronized block.
mAmInternal.broadcastCloseSystemDialogs(reason);
@@ -6902,9 +6901,9 @@
String packageName, Set<String> disabledClasses, int userId, boolean booted) {
synchronized (mGlobalLock) {
// Clean-up disabled activities.
- if (mRootActivityContainer.finishDisabledPackageActivities(
+ if (mRootWindowContainer.finishDisabledPackageActivities(
packageName, disabledClasses, true, false, userId) && booted) {
- mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mRootWindowContainer.resumeFocusedStacksTopActivities();
mStackSupervisor.scheduleIdleLocked();
}
@@ -6921,7 +6920,7 @@
boolean didSomething =
getActivityStartController().clearPendingActivityLaunches(packageName);
- didSomething |= mRootActivityContainer.finishDisabledPackageActivities(packageName,
+ didSomething |= mRootWindowContainer.finishDisabledPackageActivities(packageName,
null, doit, evenPersistent, userId);
return didSomething;
}
@@ -6930,7 +6929,7 @@
@Override
public void resumeTopActivities(boolean scheduleIdle) {
synchronized (mGlobalLock) {
- mRootActivityContainer.resumeFocusedStacksTopActivities();
+ mRootWindowContainer.resumeFocusedStacksTopActivities();
if (scheduleIdle) {
mStackSupervisor.scheduleIdleLocked();
}
@@ -6953,7 +6952,7 @@
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "attachApplication:" + wpc.mName);
}
try {
- return mRootActivityContainer.attachApplication(wpc);
+ return mRootWindowContainer.attachApplication(wpc);
} finally {
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
@@ -6978,7 +6977,7 @@
// Showing launcher to avoid user entering credential twice.
startHomeActivity(currentUserId, "notifyLockedProfile");
}
- mRootActivityContainer.lockAllProfileTasks(userId);
+ mRootWindowContainer.lockAllProfileTasks(userId);
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -7010,7 +7009,7 @@
synchronized (mGlobalLock) {
// The output proto of "activity --proto activities"
// is ActivityManagerServiceDumpActivitiesProto
- mRootActivityContainer.dumpDebug(proto,
+ mRootWindowContainer.dumpDebug(proto,
ActivityManagerServiceDumpActivitiesProto.ACTIVITY_STACK_SUPERVISOR,
WindowTraceLogLevel.ALL);
}
@@ -7106,7 +7105,7 @@
}
if (dumpPackage == null) {
pw.println(" mGlobalConfiguration: " + getGlobalConfiguration());
- mRootActivityContainer.dumpDisplayConfigs(pw, " ");
+ mRootWindowContainer.dumpDisplayConfigs(pw, " ");
}
if (dumpAll) {
if (dumpPackage == null) {
@@ -7134,7 +7133,7 @@
if (dumpPackage == null) {
pw.println(" mWakefulness="
+ PowerManagerInternal.wakefulnessToString(wakefulness));
- pw.println(" mSleepTokens=" + mRootActivityContainer.mSleepTokens);
+ pw.println(" mSleepTokens=" + mRootWindowContainer.mSleepTokens);
if (mRunningVoice != null) {
pw.println(" mRunningVoice=" + mRunningVoice);
pw.println(" mVoiceWakeLock" + mVoiceWakeLock);
@@ -7273,7 +7272,7 @@
@Override
public boolean canGcNow() {
synchronized (mGlobalLock) {
- return isSleeping() || mRootActivityContainer.allResumedActivitiesIdle();
+ return isSleeping() || mRootWindowContainer.allResumedActivitiesIdle();
}
}
@@ -7281,12 +7280,12 @@
@Override
public WindowProcessController getTopApp() {
synchronized (mGlobalLockWithoutBoost) {
- if (mRootActivityContainer == null) {
- // Return null if mRootActivityContainer not yet initialize, while update
+ if (mRootWindowContainer == null) {
+ // Return null if mRootWindowContainer not yet initialize, while update
// oomadj after AMS created.
return null;
}
- final ActivityRecord top = mRootActivityContainer.getTopResumedActivity();
+ final ActivityRecord top = mRootWindowContainer.getTopResumedActivity();
return top != null ? top.app : null;
}
}
@@ -7295,8 +7294,8 @@
@Override
public void rankTaskLayersIfNeeded() {
synchronized (mGlobalLockWithoutBoost) {
- if (mRootActivityContainer != null) {
- mRootActivityContainer.rankTaskLayersIfNeeded();
+ if (mRootWindowContainer != null) {
+ mRootWindowContainer.rankTaskLayersIfNeeded();
}
}
}
@@ -7304,35 +7303,35 @@
@Override
public void scheduleDestroyAllActivities(String reason) {
synchronized (mGlobalLock) {
- mRootActivityContainer.scheduleDestroyAllActivities(reason);
+ mRootWindowContainer.scheduleDestroyAllActivities(reason);
}
}
@Override
public void removeUser(int userId) {
synchronized (mGlobalLock) {
- mRootActivityContainer.removeUser(userId);
+ mRootWindowContainer.removeUser(userId);
}
}
@Override
public boolean switchUser(int userId, UserState userState) {
synchronized (mGlobalLock) {
- return mRootActivityContainer.switchUser(userId, userState);
+ return mRootWindowContainer.switchUser(userId, userState);
}
}
@Override
public void onHandleAppCrash(WindowProcessController wpc) {
synchronized (mGlobalLock) {
- mRootActivityContainer.handleAppCrash(wpc);
+ mRootWindowContainer.handleAppCrash(wpc);
}
}
@Override
public int finishTopCrashedActivities(WindowProcessController crashedApp, String reason) {
synchronized (mGlobalLock) {
- return mRootActivityContainer.finishTopCrashedActivities(crashedApp, reason);
+ return mRootWindowContainer.finishTopCrashedActivities(crashedApp, reason);
}
}