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

Commit d94b5c36 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

Merge "Don't skip resume on transient-launch activity" into udc-qpr-dev am: 5ea204ec am: 57faee47

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



Change-Id: I56b6a6cd5d19831988cdcea6bf12121f3fd9b334
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a97ab9a7 57faee47

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

+5 −7
Original line number Diff line number Diff line
@@ -1175,7 +1175,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;
@@ -1183,11 +1183,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;

        }
@@ -1251,7 +1249,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 */,