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

Commit bfd7e2ce authored by Louis Chang's avatar Louis Chang
Browse files

Rename Stack to Task related terms (4/n) 

Update most of methods and members with Stack terms in below files
- ActivityStarter
- ActivityRecord
- Task

No logical changes.

Bug: 157876447
Test: presubmit
Change-Id: I169ca808ba2ce148a9caee6d480c840119434ec7
parent 18cf309b

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

+31 −31
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final ActivityRecord r;

        synchronized (mGlobalLock) {

            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "activityStopped");

            r = ActivityRecord.isInStackLocked(token);

            r = ActivityRecord.isInRootTaskLocked(token);

            if (r != null) {

                if (r.attachedToProcess() && r.isState(Task.ActivityState.RESTARTING_PROCESS)) {

                    // The activity was requested to restart from
@@ -234,7 +234,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
                token, Arrays.toString(horizontalSizeConfiguration),

                Arrays.toString(verticalSizeConfigurations));

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r != null) {

                r.setSizeConfigurations(horizontalSizeConfiguration, verticalSizeConfigurations,

                        smallestSizeConfigurations);
@@ -270,7 +270,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
                final int taskId = ActivityRecord.getTaskForActivityLocked(token, !nonRoot);

                final Task task = mService.mRootWindowContainer.anyTaskForId(taskId);

                if (task != null) {

                    return ActivityRecord.getStackLocked(token).moveTaskToBack(task);

                    return ActivityRecord.getRootTask(token).moveTaskToBack(task);

                }

            }

        } finally {
@@ -295,7 +295,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
            Intent resultData) {

        final ActivityRecord r;

        synchronized (mGlobalLock) {

            r = ActivityRecord.isInStackLocked(token);

            r = ActivityRecord.isInRootTaskLocked(token);

            if (r == null) {

                return false;

            }
@@ -316,7 +316,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null || !r.isDestroyable()) {

                    return false;

                }
@@ -347,7 +347,7 @@ class ActivityClientController extends IActivityClientController.Stub { 


        final ActivityRecord r;

        synchronized (mGlobalLock) {

            r = ActivityRecord.isInStackLocked(token);

            r = ActivityRecord.isInRootTaskLocked(token);

            if (r == null) {

                return true;

            }
@@ -442,7 +442,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) {

                    return false;

                }
@@ -468,7 +468,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) return;



                // TODO: This should probably only loop over the task since you need to be in the
@@ -487,7 +487,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public boolean isTopOfTask(IBinder token) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            return r != null && r.getTask().getTopNonFinishingActivity() == r;

        }

    }
@@ -495,7 +495,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public boolean willActivityBeVisible(IBinder token) {

        synchronized (mGlobalLock) {

            final Task rootTask = ActivityRecord.getStackLocked(token);

            final Task rootTask = ActivityRecord.getRootTask(token);

            return rootTask != null && rootTask.willActivityBeVisible(token);

        }

    }
@@ -503,7 +503,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public int getDisplayId(IBinder activityToken) {

        synchronized (mGlobalLock) {

            final Task rootTask = ActivityRecord.getStackLocked(activityToken);

            final Task rootTask = ActivityRecord.getRootTask(activityToken);

            if (rootTask != null) {

                final int displayId = rootTask.getDisplayId();

                return displayId != INVALID_DISPLAY ? displayId : DEFAULT_DISPLAY;
@@ -536,7 +536,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    }



    private static ActivityRecord getCallingRecord(IBinder token) {

        final ActivityRecord r = ActivityRecord.isInStackLocked(token);

        final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

        return r != null ? r.resultTo : null;

    }
@@ -561,7 +561,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) {

                    return null;

                }
@@ -578,7 +578,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.setRequestedOrientation(requestedOrientation);

                }
@@ -591,7 +591,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public int getRequestedOrientation(IBinder token) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            return r != null

                    ? r.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

        }
@@ -602,7 +602,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                return r != null && r.setOccludesParent(true);

            }

        } finally {
@@ -616,7 +616,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) {

                    return false;

                }
@@ -634,7 +634,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public boolean isImmersive(IBinder token) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r == null) {

                throw new IllegalArgumentException();

            }
@@ -645,7 +645,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public void setImmersive(IBinder token, boolean immersive) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r == null) {

                throw new IllegalArgumentException();

            }
@@ -841,7 +841,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public void setTaskDescription(IBinder token, ActivityManager.TaskDescription td) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r != null) {

                r.setTaskDescription(td);

            }
@@ -878,7 +878,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
    @Override

    public boolean isRootVoiceInteraction(IBinder token) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            return r != null && r.rootVoiceInteraction;

        }

    }
@@ -919,7 +919,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.setShowWhenLocked(showWhenLocked);

                }
@@ -934,7 +934,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.setInheritShowWhenLocked(inheritShowWhenLocked);

                }
@@ -949,7 +949,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.setTurnScreenOn(turnScreenOn);

                }
@@ -964,7 +964,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.reportFullyDrawnLocked(restoredFromBundle);

                }
@@ -979,7 +979,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
            int enterAnim, int exitAnim) {

        final long origId = Binder.clearCallingIdentity();

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r != null && r.isState(Task.ActivityState.RESUMED, Task.ActivityState.PAUSING)) {

                r.mDisplayContent.mAppTransition.overridePendingAppTransition(

                        packageName, enterAnim, exitAnim, null, null);
@@ -995,7 +995,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final VrManagerInternal vrService = LocalServices.getService(VrManagerInternal.class);

        final ActivityRecord r;

        synchronized (mGlobalLock) {

            r = ActivityRecord.isInStackLocked(token);

            r = ActivityRecord.isInRootTaskLocked(token);

        }

        if (r == null) {

            throw new IllegalArgumentException();
@@ -1028,7 +1028,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.setDisablePreviewScreenshots(disable);

                }
@@ -1046,7 +1046,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.registerRemoteAnimations(definition);

                }
@@ -1063,7 +1063,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    r.unregisterRemoteAnimations();

                }
@@ -1078,7 +1078,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) {

                    return;

                }

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

+28 −32
Original line number Diff line number Diff line
@@ -1217,10 +1217,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return task;

    }



    Task getStack() {

        return task != null ? task.getRootTask() : null;

    }



    @Override

    void onParentChanged(ConfigurationContainer newParent, ConfigurationContainer oldParent) {

        final Task oldTask = oldParent != null ? (Task) oldParent : null;
@@ -1268,14 +1264,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else if (mLastParent != null && mLastParent.getRootTask() != null) {

            task.getRootTask().mExitingActivities.remove(this);

        }

        final Task stack = getStack();

        final Task rootTask = getRootTask();



        // If we reparent, make sure to remove ourselves from the old animation registry.

        if (mAnimatingActivityRegistry != null) {

            mAnimatingActivityRegistry.notifyFinished(this);

        }

        mAnimatingActivityRegistry = stack != null

                ? stack.getAnimatingActivityRegistry()

        mAnimatingActivityRegistry = rootTask != null

                ? rootTask.getAnimatingActivityRegistry()

                : null;



        mLastParent = task;
@@ -1289,10 +1285,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            newTask.setResumedActivity(this, "onParentChanged");

        }



        if (stack != null && stack.topRunningActivity() == this) {

        if (rootTask != null && rootTask.topRunningActivity() == this) {

            // make ensure the TaskOrganizer still works after re-parenting

            if (firstWindowDrawn) {

                stack.setHasBeenVisible(true);

                rootTask.setHasBeenVisible(true);

            }

        }

    }
@@ -2218,9 +2214,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return inHistory;

    }



    boolean isInStackLocked() {

        final Task stack = getRootTask();

        return stack != null && stack.isInTask(this) != null;

    boolean isInRootTaskLocked() {

        final Task rootTask = getRootTask();

        return rootTask != null && rootTask.isInTask(this) != null;

    }



    boolean isPersistable() {
@@ -2552,14 +2548,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return FINISH_RESULT_CANCELLED;

        }



        if (!isInStackLocked()) {

        if (!isInRootTaskLocked()) {

            Slog.w(TAG, "Finish request when not in stack for r=" + this);

            return FINISH_RESULT_CANCELLED;

        }



        final Task rootTask = getRootTask();

        final boolean mayAdjustTop = (isState(RESUMED) || rootTask.getResumedActivity() == null)

                && rootTask.isFocusedStackOnDisplay()

                && rootTask.isFocusedRootTaskOnDisplay()

                // Do not adjust focus task because the task will be reused to launch new activity.

                && !task.isClearingToReuseTask();

        final boolean shouldAdjustGlobalFocus = mayAdjustTop
@@ -2722,8 +2718,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


        final boolean isCurrentVisible = mVisibleRequested || isState(PAUSED);

        if (isCurrentVisible) {

            final Task stack = getStack();

            final ActivityRecord activity = stack.getResumedActivity();

            final Task rootTask = getRootTask();

            final ActivityRecord activity = rootTask.getResumedActivity();

            boolean ensureVisibility = false;

            if (activity != null && !activity.occludesParent()) {

                // If the resume activity is not opaque, we need to make sure the visibilities of
@@ -2813,7 +2809,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // DisplayContent#topRunningActivity().

        final ActivityRecord next = taskDisplayArea.topRunningActivity();

        final boolean isLastStackOverEmptyHome =

                next == null && stack.isFocusedStackOnDisplay()

                next == null && stack.isFocusedRootTaskOnDisplay()

                        && taskDisplayArea.getOrCreateRootHomeTask() != null;

        if (isLastStackOverEmptyHome) {

            // Don't destroy activity immediately if this is the last activity on the display and
@@ -3016,7 +3012,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    "Reported destroyed for activity that is not destroying: r=" + this);

        }



        if (isInStackLocked()) {

        if (isInRootTaskLocked()) {

            cleanUp(true /* cleanServices */, false /* setState */);

            removeFromHistory(reason);

        }
@@ -3312,21 +3308,21 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            getDisplayContent().mNoAnimationNotifyOnTransitionFinished.add(token);

        }



        final Task stack = getStack();

        final Task rootTask = getRootTask();

        if (delayed && !isEmpty()) {

            // set the token aside because it has an active animation to be finished

            ProtoLog.v(WM_DEBUG_ADD_REMOVE,

                    "removeAppToken make exiting: %s", this);

            if (stack != null) {

                stack.mExitingActivities.add(this);

            if (rootTask != null) {

                rootTask.mExitingActivities.add(this);

            }

            mIsExiting = true;

        } else {

            // Make sure there is no animation running on this token, so any windows associated

            // with it will be removed as soon as their animations are complete

            cancelAnimation();

            if (stack != null) {

                stack.mExitingActivities.remove(this);

            if (rootTask != null) {

                rootTask.mExitingActivities.remove(this);

            }

            removeIfPossible();

        }
@@ -5765,13 +5761,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return task.mTaskId;

    }



    static ActivityRecord isInStackLocked(IBinder token) {

    static ActivityRecord isInRootTaskLocked(IBinder token) {

        final ActivityRecord r = ActivityRecord.forTokenLocked(token);

        return (r != null) ? r.getRootTask().isInTask(r) : null;

    }



    static Task getStackLocked(IBinder token) {

        final ActivityRecord r = ActivityRecord.isInStackLocked(token);

    static Task getRootTask(IBinder token) {

        final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

        if (r != null) {

            return r.getRootTask();

        }
@@ -6034,7 +6030,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // a new hierarchical animation is enabled, we just let them occur as a child of the parent

        // stack, i.e. the hierarchy of the surfaces is unchanged.

        if (inPinnedWindowingMode()) {

            return getStack().getSurfaceControl();

            return getRootTask().getSurfaceControl();

        } else {

            return super.getAnimationLeashParent();

        }
@@ -6114,12 +6110,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    getTransit(), task)) {

                task.getBounds(mTmpRect);

            } else {

                final Task stack = getStack();

                if (stack == null) {

                final Task rootTask = getRootTask();

                if (rootTask == null) {

                    return;

                }

                // Set clip rect to stack bounds.

                stack.getBounds(mTmpRect);

                rootTask.getBounds(mTmpRect);

            }

            mAnimationBoundsLayer = createAnimationBoundsLayer(t);
@@ -6860,9 +6856,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    @VisibleForTesting

    @Override

    Rect getAnimationBounds(int appStackClipMode) {

        if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getStack() != null) {

        if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getRootTask() != null) {

            // Using the stack bounds here effectively applies the clipping before animation.

            return getStack().getBounds();

            return getRootTask().getBounds();

        }

        // Use task-bounds if available so that activity-level letterbox (maxAspectRatio) is

        // included in the animation.

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

+69 −67

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −9
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        SafeActivityOptions options = SafeActivityOptions.fromBundle(bOptions);



        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(callingActivity);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(callingActivity);

            if (r == null) {

                SafeActivityOptions.abort(options);

                return false;
@@ -1812,7 +1812,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final long callingId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(activityToken);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(activityToken);

                if (r == null) {

                    return;

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


        try {

            synchronized (mGlobalLock) {

                ActivityRecord r = ActivityRecord.isInStackLocked(activityToken);

                ActivityRecord r = ActivityRecord.isInRootTaskLocked(activityToken);

                if (r == null) {

                    throw new IllegalArgumentException("Activity does not exist; token="

                            + activityToken);
@@ -3483,7 +3483,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    @Override

    public void invalidateHomeTaskSnapshot(IBinder token) {

        synchronized (mGlobalLock) {

            final ActivityRecord r = ActivityRecord.isInStackLocked(token);

            final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

            if (r == null || !r.isActivityTypeHome()) {

                return;

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


        ActivityRecord activity = null;

        if (type == ActivityManager.INTENT_SENDER_ACTIVITY_RESULT) {

            activity = ActivityRecord.isInStackLocked(token);

            activity = ActivityRecord.isInRootTaskLocked(token);

            if (activity == null) {

                Slog.w(TAG, "Failed createPendingResult: activity " + token + " not in any stack");

                return null;
@@ -5488,7 +5488,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                int requestCode, int resultCode, Intent data) {

            final ActivityRecord r;

            synchronized (mGlobalLock) {

                r = ActivityRecord.isInStackLocked(activityToken);

                r = ActivityRecord.isInRootTaskLocked(activityToken);

                if (r == null || r.getRootTask() == null) {

                    return;

                }
@@ -5506,7 +5506,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        public void clearPendingResultForActivity(IBinder activityToken,

                WeakReference<PendingIntentRecord> pir) {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(activityToken);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(activityToken);

                if (r != null && r.pendingResults != null) {

                    r.pendingResults.remove(pir);

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

        public ComponentName getActivityName(IBinder activityToken) {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(activityToken);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(activityToken);

                return r != null ? r.intent.getComponent() : null;

            }

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

        public ActivityServiceConnectionsHolder getServiceConnectionsHolder(IBinder token) {

            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r == null) {

                    return null;

                }

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

+3 −3
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
                // task.reparent() should already placed the task on top,

                // still need moveTaskToFrontLocked() below for any transition settings.

            }

            if (stack.shouldResizeStackWithLaunchBounds()) {

            if (stack.shouldResizeRootTaskWithLaunchBounds()) {

                stack.resize(bounds, !PRESERVE_WINDOWS, !DEFER_RESUME);

            } else {

                // WM resizeTask must be done after the task is moved to the correct stack,
@@ -2237,13 +2237,13 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
    }



    void activityRelaunchedLocked(IBinder token) {

        final ActivityRecord r = ActivityRecord.isInStackLocked(token);

        final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

        if (r != null) {

            r.finishRelaunching();

            if (r.getRootTask().shouldSleepOrShutDownActivities()) {

                // Activity is always relaunched to either resumed or paused state. If it was

                // relaunched while hidden (by keyguard or smth else), it should be stopped.

                r.getStack().ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,

                r.getRootTask().ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,

                        false /* preserveWindows */);

            }

        }