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

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

Merge "Do not embed activity on a hidden TaskFragment" into main

parents 44fba6c5 e844e06d

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

+3 −2
Original line number Diff line number Diff line
@@ -3270,8 +3270,9 @@ class ActivityStarter { 
                return null;

            }

            final TaskFragment taskFragment = wc.asTaskFragment();

            if (taskFragment == null || taskFragment.isRemovalRequested()) {

                // Skip if the TaskFragment is going to be finished.

            if (taskFragment == null || taskFragment.isRemovalRequested()

                    || taskFragment.isForceHidden()) {

                // Skip if the TaskFragment is going to be finished or is hidden.

                continue;

            }

            if (taskFragment.getActivity(ActivityRecord::canBeTopRunning) == null) {