Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db553dcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bda3d632 6cdd2053

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ import static com.android.server.wm.Task.ActivityState.RESUMED; 
import static com.android.server.wm.Task.ActivityState.STARTED;

import static com.android.server.wm.Task.ActivityState.STOPPED;

import static com.android.server.wm.Task.ActivityState.STOPPING;

import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE;

import static com.android.server.wm.Task.TASK_VISIBILITY_VISIBLE;

import static com.android.server.wm.TaskPersister.DEBUG;

import static com.android.server.wm.TaskPersister.IMAGE_EXTENSION;

import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
@@ -4881,7 +4881,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     */

    private boolean shouldBeResumed(ActivityRecord activeActivity) {

        return shouldMakeActive(activeActivity) && isFocusable()

                && getTask().getVisibility(activeActivity) == STACK_VISIBILITY_VISIBLE

                && getTask().getVisibility(activeActivity) == TASK_VISIBILITY_VISIBLE

                && canResumeByCompat();

    }

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+12 −12
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL; 
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_IDLE;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_STACK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ROOT_TASK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_IDLE;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_PAUSE;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RECENTS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STACK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ROOT_TASK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TASKS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
@@ -66,14 +66,14 @@ import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_N 
import static com.android.server.wm.LockTaskController.LOCK_TASK_AUTH_ALLOWLISTED;

import static com.android.server.wm.LockTaskController.LOCK_TASK_AUTH_LAUNCHABLE;

import static com.android.server.wm.LockTaskController.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;

import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS;

import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE;

import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS;

import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS_AND_RESTORE;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.Task.ActivityState.PAUSED;

import static com.android.server.wm.Task.ActivityState.PAUSING;

import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_PINNED_TASK;

import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT;

import static com.android.server.wm.Task.REPARENT_KEEP_ROOT_TASK_AT_FRONT;

import static com.android.server.wm.Task.TAG_CLEANUP;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -158,7 +158,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
    private static final String TAG_IDLE = TAG + POSTFIX_IDLE;

    private static final String TAG_PAUSE = TAG + POSTFIX_PAUSE;

    private static final String TAG_RECENTS = TAG + POSTFIX_RECENTS;

    private static final String TAG_STACK = TAG + POSTFIX_STACK;

    private static final String TAG_ROOT_TASK = TAG + POSTFIX_ROOT_TASK;

    private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH;

    static final String TAG_TASKS = TAG + POSTFIX_TASKS;
@@ -526,7 +526,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        int candidateTaskId = nextTaskIdForUser(currentTaskId, userId);

        while (mRecentTasks.containsTaskId(candidateTaskId, userId)

                || mRootWindowContainer.anyTaskForId(

                        candidateTaskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS) != null) {

                        candidateTaskId, MATCH_ATTACHED_TASK_OR_RECENT_TASKS) != null) {

            candidateTaskId = nextTaskIdForUser(candidateTaskId, userId);

            if (candidateTaskId == currentTaskId) {

                // Something wrong!
@@ -1360,8 +1360,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 


            if (stack != currentStack) {

                moveHomeStackToFrontIfNeeded(flags, stack.getDisplayArea(), reason);

                task.reparent(stack, ON_TOP, REPARENT_KEEP_STACK_AT_FRONT, !ANIMATE, DEFER_RESUME,

                        reason);

                task.reparent(stack, ON_TOP, REPARENT_KEEP_ROOT_TASK_AT_FRONT, !ANIMATE,

                        DEFER_RESUME, reason);

                currentStack = stack;

                reparented = true;

                // task.reparent() should already placed the task on top,
@@ -1385,7 +1385,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        currentStack.moveTaskToFront(task, false /* noAnimation */, options,

                r == null ? null : r.appTimeTracker, reason);



        if (DEBUG_STACK) Slog.d(TAG_STACK,

        if (DEBUG_ROOT_TASK) Slog.d(TAG_ROOT_TASK,

                "findTaskToMoveToFront: moved to front of stack=" + currentStack);



        handleNonResizableTaskIfNeeded(task, WINDOWING_MODE_UNDEFINED,
@@ -1502,7 +1502,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
    boolean removeTaskById(int taskId, boolean killProcess, boolean removeFromRecents,

            String reason) {

        final Task task =

                mRootWindowContainer.anyTaskForId(taskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                mRootWindowContainer.anyTaskForId(taskId, MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

        if (task != null) {

            removeTask(task, killProcess, removeFromRecents, reason);

            return true;
@@ -2478,7 +2478,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        mService.deferWindowLayout();

        try {

            task = mRootWindowContainer.anyTaskForId(taskId,

                    MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE, activityOptions, ON_TOP);

                    MATCH_ATTACHED_TASK_OR_RECENT_TASKS_AND_RESTORE, activityOptions, ON_TOP);

            if (task == null) {

                mWindowManager.executeAppTransition();

                throw new IllegalArgumentException(

services/core/java/com/android/server/wm/ActivityStarter.java

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ import static com.android.server.wm.ActivityTaskManagerService.ANIMATE; 
import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_BOUNDS;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_DISPLAY;

import static com.android.server.wm.Task.ActivityState.RESUMED;

import static com.android.server.wm.Task.REPARENT_MOVE_STACK_TO_FRONT;

import static com.android.server.wm.Task.REPARENT_MOVE_ROOT_TASK_TO_FRONT;

import static com.android.server.wm.WindowContainer.POSITION_TOP;



import android.annotation.NonNull;
@@ -2532,8 +2532,8 @@ class ActivityStarter { 
                            "bringingFoundTaskToFront");

                    mMovedToFront = !isSplitScreenTopStack;

                } else {

                    intentTask.reparent(launchStack, ON_TOP, REPARENT_MOVE_STACK_TO_FRONT, ANIMATE,

                            DEFER_RESUME, "reparentToTargetStack");

                    intentTask.reparent(launchStack, ON_TOP, REPARENT_MOVE_ROOT_TASK_TO_FRONT,

                            ANIMATE, DEFER_RESUME, "reparentToTargetStack");

                    mMovedToFront = true;

                }

                mOptions = null;

services/core/java/com/android/server/wm/ActivityTaskManagerDebugConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class ActivityTaskManagerDebugConfig { 


    static final boolean DEBUG_RECENTS = DEBUG_ALL || false;

    static final boolean DEBUG_RECENTS_TRIM_TASKS = DEBUG_RECENTS || false;

    static final boolean DEBUG_STACK = DEBUG_ALL || false;

    static final boolean DEBUG_ROOT_TASK = DEBUG_ALL || false;

    public static final boolean DEBUG_SWITCH = DEBUG_ALL || false;

    static final boolean DEBUG_TRANSITION = DEBUG_ALL || false;

    static final boolean DEBUG_VISIBILITY = DEBUG_ALL || false;
@@ -73,7 +73,7 @@ public class ActivityTaskManagerDebugConfig { 
    static final String POSTFIX_PAUSE = APPEND_CATEGORY_NAME ? "_Pause" : "";

    static final String POSTFIX_RECENTS = APPEND_CATEGORY_NAME ? "_Recents" : "";

    static final String POSTFIX_SAVED_STATE = APPEND_CATEGORY_NAME ? "_SavedState" : "";

    static final String POSTFIX_STACK = APPEND_CATEGORY_NAME ? "_Stack" : "";

    static final String POSTFIX_ROOT_TASK = APPEND_CATEGORY_NAME ? "_RootTask" : "";

    static final String POSTFIX_STATES = APPEND_CATEGORY_NAME ? "_States" : "";

    public static final String POSTFIX_SWITCH = APPEND_CATEGORY_NAME ? "_Switch" : "";

    static final String POSTFIX_TASKS = APPEND_CATEGORY_NAME ? "_Tasks" : "";

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+18 −18
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_CONFI 
import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_FOCUS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_IMMERSIVE;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_LOCKTASK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STACK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ROOT_TASK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_VISIBILITY;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
@@ -120,11 +120,11 @@ import static com.android.server.wm.ActivityTaskManagerService.UiHandler.DISMISS 
import static com.android.server.wm.LockTaskController.LOCK_TASK_AUTH_DONT_LOCK;

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.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.RootWindowContainer.MATCH_ATTACHED_TASK_ONLY;

import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS;

import static com.android.server.wm.Task.ActivityState.DESTROYED;

import static com.android.server.wm.Task.ActivityState.DESTROYING;

import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT;

import static com.android.server.wm.Task.REPARENT_KEEP_ROOT_TASK_AT_FRONT;

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
@@ -306,7 +306,7 @@ import java.util.Set; 
 */

public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityTaskManagerService" : TAG_ATM;

    static final String TAG_STACK = TAG + POSTFIX_STACK;

    static final String TAG_ROOT_TASK = TAG + POSTFIX_ROOT_TASK;

    static final String TAG_SWITCH = TAG + POSTFIX_SWITCH;

    private static final String TAG_IMMERSIVE = TAG + POSTFIX_IMMERSIVE;

    private static final String TAG_FOCUS = TAG + POSTFIX_FOCUS;
@@ -2228,7 +2228,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        try {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_ONLY);

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    return;

                }
@@ -2266,7 +2266,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            final long ident = Binder.clearCallingIdentity();

            try {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                        MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

                if (task == null) {

                    Slog.w(TAG, "removeTask: No task remove with id=" + taskId);

                    return false;
@@ -2374,7 +2374,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        try {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                        MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

                if (task == null) {

                    Slog.w(TAG, "getTaskBounds: taskId=" + taskId + " not found");

                    return rect;
@@ -2397,7 +2397,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            enforceCallerIsRecentsOrHasPermission(

                    MANAGE_ACTIVITY_TASKS, "getTaskDescription()");

            final Task tr = mRootWindowContainer.anyTaskForId(id,

                    MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                    MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

            if (tr != null) {

                return tr.getTaskDescription();

            }
@@ -2418,7 +2418,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    return setTaskWindowingModeSplitScreen(taskId, windowingMode, toTop);

                }

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_ONLY);

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    Slog.w(TAG, "setTaskWindowingMode: No task for id=" + taskId);

                    return false;
@@ -2789,8 +2789,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    throw new IllegalArgumentException("moveTaskToRootTask: Attempt to move task "

                            + taskId + " to rootTask " + rootTaskId);

                }

                task.reparent(rootTask, toTop, REPARENT_KEEP_STACK_AT_FRONT, ANIMATE, !DEFER_RESUME,

                        "moveTaskToRootTask");

                task.reparent(rootTask, toTop, REPARENT_KEEP_ROOT_TASK_AT_FRONT, ANIMATE,

                        !DEFER_RESUME, "moveTaskToRootTask");

            } finally {

                Binder.restoreCallingIdentity(ident);

            }
@@ -2834,7 +2834,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }



        final Task task = mRootWindowContainer.anyTaskForId(taskId,

                MATCH_TASK_IN_STACKS_ONLY);

                MATCH_ATTACHED_TASK_ONLY);

        if (task == null) {

            Slog.w(TAG, "setTaskWindowingModeSplitScreenPrimary: No task for id=" + taskId);

            return false;
@@ -3013,7 +3013,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        try {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_ONLY);

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    return;

                }
@@ -3361,7 +3361,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    public void setTaskResizeable(int taskId, int resizeableMode) {

        synchronized (mGlobalLock) {

            final Task task = mRootWindowContainer.anyTaskForId(

                    taskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                    taskId, MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

            if (task == null) {

                Slog.w(TAG, "setTaskResizeable: taskId=" + taskId + " not found");

                return;
@@ -3377,7 +3377,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        try {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_ONLY);

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    Slog.w(TAG, "resizeTask: taskId=" + taskId + " not found");

                    return false;
@@ -4395,7 +4395,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        try {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_TASK_IN_STACKS_ONLY);

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    Slog.w(TAG, "cancelTaskWindowTransition: taskId=" + taskId + " not found");

                    return;
@@ -4423,7 +4423,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final Task task;

        synchronized (mGlobalLock) {

            task = mRootWindowContainer.anyTaskForId(taskId,

                    MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                    MATCH_ATTACHED_TASK_OR_RECENT_TASKS);

            if (task == null) {

                Slog.w(TAG, "getTaskSnapshot: taskId=" + taskId + " not found");

                return null;