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

Commit 6cac1114 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Reduce updating focus when moving an activity which is not resumed yet" into main

parents 0c7ac2cc 961c7d4d

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

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




        rootTask.moveToFront(reason, task);

        rootTask.moveToFront(reason, task);

        // Report top activity change to tracking services and WM

        // Report top activity change to tracking services and WM

        if (mRootWindowContainer.getTopResumedActivity() == this) {

        if (mState == RESUMED && mRootWindowContainer.getTopResumedActivity() == this) {

            mAtmService.setLastResumedActivityUncheckLocked(this, reason);

            mAtmService.setLastResumedActivityUncheckLocked(this, reason);

        }

        }

        return true;

        return true;

services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { 
                .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW).build();

                .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW).build();

        final ActivityRecord activity1 = new ActivityBuilder(mAtm)

        final ActivityRecord activity1 = new ActivityBuilder(mAtm)

                .setTask(task1).setUid(ActivityBuilder.DEFAULT_FAKE_UID + 1).build();

                .setTask(task1).setUid(ActivityBuilder.DEFAULT_FAKE_UID + 1).build();

        task1.setResumedActivity(activity1, "test");

        activity1.setState(ActivityRecord.State.RESUMED, "test");





        final ActivityRecord activity2 = new TaskBuilder(mSupervisor)

        final ActivityRecord activity2 = new TaskBuilder(mSupervisor)

                .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW)

                .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW)