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

Commit 27d5a1f5 authored by Louis Chang's avatar Louis Chang
Browse files

Avoid adjusting top focused root task while clear task 

Top focused root task was updated while clear task for reuse, which
isn't necessary. This was happening after 046523ce merged.

Also avoid resuming the top activity in next focused
root task to prevent additional top-resumed-activity state changes.

Bug: 160613519
Bug: 163003067
Test: asit/perf/junit/jank_systemui_test

Change-Id: I8ddbfc3b0a62ddb29833d324e42812ed0dc096db
(cherry picked from commit 2caec7ba)
parent 5c344f74

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

+3 −1
Original line number Diff line number Diff line
@@ -2543,7 +2543,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


        final ActivityStack stack = getRootTask();

        final boolean mayAdjustTop = (isState(RESUMED) || stack.mResumedActivity == null)

                && stack.isFocusedStackOnDisplay();

                && stack.isFocusedStackOnDisplay()

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

                && !task.isClearingToReuseTask();

        final boolean shouldAdjustGlobalFocus = mayAdjustTop

                // It must be checked before {@link #makeFinishingLocked} is called, because a stack

                // is not visible if it only contains finishing activities.

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

+0 −2
Original line number Diff line number Diff line
@@ -2009,8 +2009,6 @@ class ActivityStarter { 
            // of history or if it is finished immediately), thus disassociating the task. Also note

            // that mReuseTask is reset as a result of {@link Task#performClearTaskLocked}

            // launching another activity.

            // TODO(b/36119896):  We shouldn't trigger activity launches in this path since we are

            // already launching one.

            targetTask.performClearTaskLocked();

            targetTask.setIntent(mStartActivity);

            mAddingToTask = true;

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

+15 −4
Original line number Diff line number Diff line
@@ -1528,14 +1528,25 @@ class Task extends WindowContainer<WindowContainer> { 
     */

    void performClearTaskLocked() {

        mReuseTask = true;

        mStackSupervisor.beginDeferResume();

        try {

            performClearTask("clear-task-all");

        } finally {

            mStackSupervisor.endDeferResume();

            mReuseTask = false;

        }

    }



    ActivityRecord performClearTaskForReuseLocked(ActivityRecord newR, int launchFlags) {

        mReuseTask = true;

        final ActivityRecord result = performClearTaskLocked(newR, launchFlags);

        mStackSupervisor.beginDeferResume();

        final ActivityRecord result;

        try {

            result = performClearTaskLocked(newR, launchFlags);

        } finally {

            mStackSupervisor.endDeferResume();

            mReuseTask = false;

        }

        return result;

    }