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

Commit e2c24bb6 authored by Jeff Chang's avatar Jeff Chang
Browse files

Do not add the finishing Activity to mNoHistoryActivities 

The resumed activity is added to mNoHistoryActiviyies while start
pausing the currently resumed activity. The activity in pending
finish state should be ignored while pausing the activity.

Bug: 200159293
Test: atest ActivityStarterTests
Change-Id: I396b115d340916c5a89019fa9f2cd250bfaee0f8
parent f7f93694

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

+2 −1
Original line number Diff line number Diff line
@@ -1387,7 +1387,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        ProtoLog.v(WM_DEBUG_STATES, "Moving to PAUSING: %s", prev);

        mPausingActivity = prev;

        mLastPausedActivity = prev;

        if (prev.isNoHistory() && !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {

        if (!prev.finishing && prev.isNoHistory()

                && !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {

            mTaskSupervisor.mNoHistoryActivities.add(prev);

        }

        prev.setState(PAUSING, "startPausingLocked");