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

Commit 37f11639 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Clear the TF#mPausingActivity before complete finishing the Activity" into main

parents d24f7b2d 0348b3f2

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

+1 −1
Original line number Diff line number Diff line
@@ -1904,6 +1904,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            prev.setWillCloseOrEnterPip(false);

            final boolean wasStopping = prev.isState(STOPPING);

            prev.setState(PAUSED, "completePausedLocked");

            mPausingActivity = null;

            if (prev.finishing) {

                // We will update the activity visibility later, no need to do in

                // completeFinishing(). Updating visibility here might also making the next
@@ -1939,7 +1940,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            if (prev != null) {

                prev.stopFreezingScreen(true /* unfreezeNow */, true /* force */);

            }

            mPausingActivity = null;

        }



        if (resumeNext) {