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

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

Merge "Ensure no resumed activity while staring one in the same TF" into main

parents b6e12c1e dce1d3ab

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

+8 −0
Original line number Diff line number Diff line
@@ -794,6 +794,14 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
            return false;

        }



        // Try pausing the existing resumed activity in the same TaskFragment if any.

        final TaskFragment taskFragment = r.getTaskFragment();

        if (taskFragment != null && taskFragment.getResumedActivity() != null) {

            if (taskFragment.startPausing(mUserLeaving, false /* uiSleeping */, r, "realStart")) {

                return false;

            }

        }



        final Task task = r.getTask();

        final Task rootTask = task.getRootTask();