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

Commit 77551ed3 authored by Louis Chang's avatar Louis Chang
Browse files

Revert part of ag/6685504 

We don't actually need to post a message here because the same
message was scheduled to resume the top activities for that case
in ActivityStartController#startHomeActivity().

Bug: 131401344
Bug: 126747441
Test: MultiDisplayPolicyTests
Test: DeviceOwnerTest

Change-Id: I347134eb4246eccf308c658bd71109ba969cb78c
parent b0815a51

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

+1 −15
Original line number Diff line number Diff line
@@ -3051,22 +3051,8 @@ class ActivityStack extends ConfigurationContainer { 
        ActivityOptions.abort(options);

        if (DEBUG_STATES) Slog.d(TAG_STATES,

                "resumeTopActivityInNextFocusableStack: " + reason + ", go home");

        if (isActivityTypeHome()) {

            // resumeTopActivityUncheckedLocked has been prevented to run recursively. Post a

            // runnable to resume home since we are currently in the process of resuming top

            // activity in home stack.

            // See {@link #mInResumeTopActivity}.

            mService.mH.post(

                    () -> {

                        synchronized (mService.mGlobalLock) {

                            mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);

                        }

                    });

            return true;

        } else {

        return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);

    }

    }



    /** Returns the position the input task should be placed in this stack. */

    int getAdjustedPositionForTask(TaskRecord task, int suggestedPosition,