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

Commit e844e06d authored by Louis Chang's avatar Louis Chang
Browse files

Do not embed activity on a hidden TaskFragment 

Home activity was started again when the existing instance was
removed. Somehow, the new home activity was unexpected embedded
into a hidden TaskFragment on home task, which is going to be
removed soon.

Bug: 402126069
Test: verified via the steps on the bug
Flag: EXEMPT bugfix
Change-Id: I4367a75ecb2782d06df8a77b71878d7378a44252
parent 70d5e516

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) {