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

Commit d8c72d93 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Don't skip resume on transient-launch activity" into udc-d1-dev am: bc12ac94 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24704763



Change-Id: I2ec7e981c048be32613b0977f5f7a769342fbd14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbfadc8a bc12ac94

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

+5 −7
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    }



    final boolean resumeTopActivity(ActivityRecord prev, ActivityOptions options,

            boolean deferPause) {

            boolean skipPause) {

        ActivityRecord next = topRunningActivity(true /* focusableOnly */);

        if (next == null || !next.canResumeByCompat()) {

            return false;
@@ -1162,11 +1162,9 @@ class TaskFragment extends WindowContainer<WindowContainer> { 


        next.delayedResume = false;



        // If we are currently pausing an activity, then don't do anything until that is done.

        final boolean allPausedComplete = mRootWindowContainer.allPausedActivitiesComplete();

        if (!allPausedComplete) {

            ProtoLog.v(WM_DEBUG_STATES,

                    "resumeTopActivity: Skip resume: some activity pausing.");

        if (!skipPause && !mRootWindowContainer.allPausedActivitiesComplete()) {

            // If we aren't skipping pause, then we have to wait for currently pausing activities.

            ProtoLog.v(WM_DEBUG_STATES, "resumeTopActivity: Skip resume: some activity pausing.");

            return false;

        }
@@ -1230,7 +1228,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            lastResumed = lastFocusedRootTask.getTopResumedActivity();

        }



        boolean pausing = !deferPause && taskDisplayArea.pauseBackTasks(next);

        boolean pausing = !skipPause && taskDisplayArea.pauseBackTasks(next);

        if (mResumedActivity != null) {

            ProtoLog.d(WM_DEBUG_STATES, "resumeTopActivity: Pausing %s", mResumedActivity);

            pausing |= startPausing(mTaskSupervisor.mUserLeaving, false /* uiSleeping */,