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

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

Merge changes Ia13c8ed5,Ia82aedfd,I99ca0d18 

* changes:
  Removed debug code that is never.
  Switched WindowToken/AppWindowToken to use WindowContainer
  Removed child windows from WindowToken window list
parents 9ec275ca 686ae0e3

services/core/java/com/android/server/am/ActivityStack.java

+0 −58
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ import com.android.internal.os.BatteryStatsImpl; 
import com.android.server.Watchdog;

import com.android.server.am.ActivityManagerService.ItemMatcher;

import com.android.server.am.ActivityStackSupervisor.ActivityContainer;

import com.android.server.wm.TaskGroup;

import com.android.server.wm.WindowManagerService;



import java.io.FileDescriptor;
@@ -162,8 +161,6 @@ final class ActivityStack { 
    private static final String TAG_USER_LEAVING = TAG + POSTFIX_USER_LEAVING;

    private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY;



    private static final boolean VALIDATE_TOKENS = false;



    // Ticks during which we check progress while waiting for an app to launch.

    static final int LAUNCH_TICK = 500;
@@ -241,11 +238,6 @@ final class ActivityStack { 
     */

    private final ArrayList<TaskRecord> mTaskHistory = new ArrayList<>();



    /**

     * Used for validating app tokens with window manager.

     */

    final ArrayList<TaskGroup> mValidateAppTokens = new ArrayList<>();



    /**

     * List of running activities, sorted by recent usage.

     * The first entry in the list is the least recently used.
@@ -899,9 +891,6 @@ final class ActivityStack { 
                ++i;

            }

        }

        if (VALIDATE_TOKENS) {

            validateAppTokensLocked();

        }

    }



    void minimalResumeActivityLocked(ActivityRecord r) {
@@ -2763,9 +2752,6 @@ final class ActivityStack { 
                        task.addActivityToTop(r);

                        r.putInHistory();

                        addConfigOverride(r, task);

                        if (VALIDATE_TOKENS) {

                            validateAppTokensLocked();

                        }

                        ActivityOptions.abort(options);

                        return;

                    }
@@ -2867,35 +2853,9 @@ final class ActivityStack { 
            // because there is nothing for it to animate on top of.

            addConfigOverride(r, task);

            ActivityOptions.abort(options);

            options = null;

        }

        if (VALIDATE_TOKENS) {

            validateAppTokensLocked();

        }

    }



    final void validateAppTokensLocked() {

        mValidateAppTokens.clear();

        mValidateAppTokens.ensureCapacity(numActivities());

        final int numTasks = mTaskHistory.size();

        for (int taskNdx = 0; taskNdx < numTasks; ++taskNdx) {

            TaskRecord task = mTaskHistory.get(taskNdx);

            final ArrayList<ActivityRecord> activities = task.mActivities;

            if (activities.isEmpty()) {

                continue;

            }

            TaskGroup group = new TaskGroup();

            group.taskId = task.taskId;

            mValidateAppTokens.add(group);

            final int numActivities = activities.size();

            for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {

                final ActivityRecord r = activities.get(activityNdx);

                group.tokens.add(r.appToken);

            }

        }

        mWindowManager.validateAppTokens(mStackId, mValidateAppTokens);

    }



    /**

     * Perform a reset of the given task, if needed as part of launching it.

     * Returns the new HistoryRecord at the top of the task.
@@ -3005,10 +2965,6 @@ final class ActivityStack { 
                }



                mWindowManager.moveTaskToBottom(targetTask.taskId);

                if (VALIDATE_TOKENS) {

                    validateAppTokensLocked();

                }



                replyChainEnd = -1;

            } else if (forceReset || finishOnTaskLaunch || clearWhenTaskReset) {

                // If the activity should just be removed -- either
@@ -3146,9 +3102,6 @@ final class ActivityStack { 
                        setAppTask(p, task);

                    }

                    mWindowManager.moveTaskToTop(taskId);

                    if (VALIDATE_TOKENS) {

                        validateAppTokensLocked();

                    }



                    // Now we've moved it in to place...  but what if this is

                    // a singleTop activity and we have put it on top of another
@@ -3897,9 +3850,6 @@ final class ActivityStack { 
        if (DEBUG_APP) Slog.v(TAG_APP, "Clearing app during remove for activity " + r);

        r.app = null;

        mWindowManager.removeAppToken(r.appToken);

        if (VALIDATE_TOKENS) {

            validateAppTokensLocked();

        }

        final TaskRecord task = r.task;

        if (task != null && task.removeActivity(r)) {

            if (DEBUG_STACK) Slog.i(TAG_STACK,
@@ -4395,10 +4345,6 @@ final class ActivityStack { 


        mStackSupervisor.resumeFocusedStackTopActivityLocked();

        EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.userId, tr.taskId);



        if (VALIDATE_TOKENS) {

            validateAppTokensLocked();

        }

    }



    /**
@@ -4513,10 +4459,6 @@ final class ActivityStack { 
        mWindowManager.prepareAppTransition(TRANSIT_TASK_TO_BACK, false);

        mWindowManager.moveTaskToBottom(taskId);



        if (VALIDATE_TOKENS) {

            validateAppTokensLocked();

        }



        final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;

        if (prevIsHome || (task == tr && canGoHome) || (numTasks <= 1 && isOnHomeDisplay())) {

            if (!mService.mBooting && !mService.mBooted) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2464,7 +2464,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            // entrance of the new window to be properly animated.

            // Note here we always set the replacing window first, as the flags might be needed

            // during the relaunch. If we end up not doing any relaunch, we clear the flags later.

            mWindowManager.setReplacingWindow(topActivity.appToken, animate);

            mWindowManager.setWillReplaceWindow(topActivity.appToken, animate);

        }



        mWindowManager.deferSurfaceLayout();
@@ -2506,7 +2506,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            // If we didn't actual do a relaunch (indicated by kept==true meaning we kept the old

            // window), we need to clear the replace window settings. Otherwise, we schedule a

            // timeout to remove the old window if the replacing window is not coming in time.

            mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken, !kept);

            mWindowManager.scheduleClearWillReplaceWindows(topActivity.appToken, !kept);

        }



        if (!deferResume) {

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

+149 −480

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ class DisplayContent { 
     */

    TaskStack getDockedStackLocked() {

        final TaskStack stack = mService.mStackIdToStack.get(DOCKED_STACK_ID);

        return (stack != null && stack.isVisibleLocked()) ? stack : null;

        return (stack != null && stack.isVisible()) ? stack : null;

    }



    /**
@@ -633,7 +633,7 @@ class DisplayContent { 
     */

    TaskStack getDockedStackVisibleForUserLocked() {

        final TaskStack stack = mService.mStackIdToStack.get(DOCKED_STACK_ID);

        return (stack != null && stack.isVisibleLocked(true /* ignoreKeyguard */)) ? stack : null;

        return (stack != null && stack.isVisible(true /* ignoreKeyguard */)) ? stack : null;

    }



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ public class DockedStackDividerController implements DimLayerUser { 
        final ArrayList<Task> homeStackTasks = homeStack.getTasks();

        final Task topHomeStackTask = homeStackTasks.get(homeStackTasks.size() - 1);

        final boolean homeVisible = homeTask.getTopVisibleAppToken() != null;

        final boolean homeBehind = (fullscreenStack != null && fullscreenStack.isVisibleLocked())

        final boolean homeBehind = (fullscreenStack != null && fullscreenStack.isVisible())

                || (homeStackTasks.size() > 1 && topHomeStackTask != homeTask);

        // If the home task is an on-top launcher, we don't want to minimize the docked stack.

        // Instead we want everything underneath that was visible to remain visible.
@@ -639,7 +639,7 @@ public class DockedStackDividerController implements DimLayerUser { 
        final ArrayList<TaskStack> stacks = mDisplayContent.getStacks();

        for (int i = stacks.size() - 1; i >= 0; --i) {

            final TaskStack stack = stacks.get(i);

            if (stack.isVisibleLocked() && stack.isAdjustedForIme()) {

            if (stack.isVisible() && stack.isAdjustedForIme()) {

                stack.beginImeAdjustAnimation();

            }

        }