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

Commit 26748891 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not add the finishing Activity to mNoHistoryActivities" into sc-v2-dev

parents 313f6d2c e2c24bb6

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

+2 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,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");