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

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

Merge "Clean up for TODO(b/111361570)"

parents 73715ca6 2235efb3

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -1523,7 +1523,6 @@ final class ActivityRecord extends ConfigurationContainer { 
        stack.moveToFront(reason, task);

        stack.moveToFront(reason, task);

        // Report top activity change to tracking services and WM

        // Report top activity change to tracking services and WM

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

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

            // TODO(b/111361570): Support multiple focused apps in WM

            mAtmService.setResumedActivityUncheckLocked(this, reason);

            mAtmService.setResumedActivityUncheckLocked(this, reason);

        }

        }

        return true;

        return true;

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -565,7 +565,6 @@ class ActivityStack extends ConfigurationContainer { 
                    + reason);

                    + reason);

            setResumedActivity(record, reason + " - onActivityStateChanged");

            setResumedActivity(record, reason + " - onActivityStateChanged");

            if (record == mRootActivityContainer.getTopResumedActivity()) {

            if (record == mRootActivityContainer.getTopResumedActivity()) {

                // TODO(b/111361570): Support multiple focused apps in WM

                mService.setResumedActivityUncheckLocked(record, reason);

                mService.setResumedActivityUncheckLocked(record, reason);

            }

            }

            mStackSupervisor.mRecentTasks.add(record.getTaskRecord());

            mStackSupervisor.mRecentTasks.add(record.getTaskRecord());
@@ -3711,9 +3710,6 @@ class ActivityStack extends ConfigurationContainer { 
        if (nextFocusableStack != null) {

        if (nextFocusableStack != null) {

            final ActivityRecord top = nextFocusableStack.topRunningActivityLocked();

            final ActivityRecord top = nextFocusableStack.topRunningActivityLocked();

            if (top != null && top == mRootActivityContainer.getTopResumedActivity()) {

            if (top != null && top == mRootActivityContainer.getTopResumedActivity()) {

                // TODO(b/111361570): Remove this and update focused app per-display in

                // WindowManager every time an activity becomes resumed in

                // ActivityTaskManagerService#setResumedActivityUncheckLocked().

                mService.setResumedActivityUncheckLocked(top, reason);

                mService.setResumedActivityUncheckLocked(top, reason);

            }

            }

            return;

            return;
@@ -5651,7 +5647,6 @@ class ActivityStack extends ConfigurationContainer { 
        // If the original state is resumed, there is no state change to update focused app.

        // If the original state is resumed, there is no state change to update focused app.

        // So here makes sure the activity focus is set if it is the top.

        // So here makes sure the activity focus is set if it is the top.

        if (origState == RESUMED && r == mRootActivityContainer.getTopResumedActivity()) {

        if (origState == RESUMED && r == mRootActivityContainer.getTopResumedActivity()) {

            // TODO(b/111361570): Support multiple focused apps in WM

            mService.setResumedActivityUncheckLocked(r, reason);

            mService.setResumedActivityUncheckLocked(r, reason);

        }

        }

    }

    }