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

Commit 9bd36da1 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Reports top resumed activity state loss when no focused task" into... 

Merge "Reports top resumed activity state loss when no focused task" into udc-qpr-dev am: 5c8ee219 am: 209d44a7

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



Change-Id: I486d20f22c3225b3f90dd388971e9464c9f76bdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66335f8b 209d44a7

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

+22 −10
Original line number Original line Diff line number Diff line
@@ -2367,6 +2367,10 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        final ActivityRecord prevTopActivity = mTopResumedActivity;

        final ActivityRecord prevTopActivity = mTopResumedActivity;

        final Task topRootTask = mRootWindowContainer.getTopDisplayFocusedRootTask();

        final Task topRootTask = mRootWindowContainer.getTopDisplayFocusedRootTask();

        if (topRootTask == null || topRootTask.getTopResumedActivity() == prevTopActivity) {

        if (topRootTask == null || topRootTask.getTopResumedActivity() == prevTopActivity) {

            if (topRootTask == null) {

                // There's no focused task and there won't have any resumed activity either.

                scheduleTopResumedActivityStateLossIfNeeded();

            }

            if (mService.isSleepingLocked()) {

            if (mService.isSleepingLocked()) {

                // There won't be a next resumed activity. The top process should still be updated

                // There won't be a next resumed activity. The top process should still be updated

                // according to the current top focused activity.

                // according to the current top focused activity.
@@ -2376,16 +2380,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        }

        }





        // Ask previous activity to release the top state.

        // Ask previous activity to release the top state.

        final boolean prevActivityReceivedTopState =

        scheduleTopResumedActivityStateLossIfNeeded();

                prevTopActivity != null && !mTopResumedActivityWaitingForPrev;

        // mTopResumedActivityWaitingForPrev == true at this point would mean that an activity

        // before the prevTopActivity one hasn't reported back yet. So server never sent the top

        // resumed state change message to prevTopActivity.

        if (prevActivityReceivedTopState

                && prevTopActivity.scheduleTopResumedActivityChanged(false /* onTop */)) {

            scheduleTopResumedStateLossTimeout(prevTopActivity);

            mTopResumedActivityWaitingForPrev = true;

        }





        // Update the current top activity.

        // Update the current top activity.

        mTopResumedActivity = topRootTask.getTopResumedActivity();

        mTopResumedActivity = topRootTask.getTopResumedActivity();
@@ -2410,6 +2405,23 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        mService.updateTopApp(mTopResumedActivity);

        mService.updateTopApp(mTopResumedActivity);

    }

    }





    /** Schedule current top resumed activity state loss */

    private void scheduleTopResumedActivityStateLossIfNeeded() {

        if (mTopResumedActivity == null) {

            return;

        }



        // mTopResumedActivityWaitingForPrev == true at this point would mean that an activity

        // before the prevTopActivity one hasn't reported back yet. So server never sent the top

        // resumed state change message to prevTopActivity.

        if (!mTopResumedActivityWaitingForPrev

                && mTopResumedActivity.scheduleTopResumedActivityChanged(false /* onTop */)) {

            scheduleTopResumedStateLossTimeout(mTopResumedActivity);

            mTopResumedActivityWaitingForPrev = true;

            mTopResumedActivity = null;

        }

    }



    /** Schedule top resumed state change if previous top activity already reported back. */

    /** Schedule top resumed state change if previous top activity already reported back. */

    private void scheduleTopResumedActivityStateIfNeeded() {

    private void scheduleTopResumedActivityStateIfNeeded() {

        if (mTopResumedActivity != null && !mTopResumedActivityWaitingForPrev) {

        if (mTopResumedActivity != null && !mTopResumedActivityWaitingForPrev) {