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

Commit 26a92f5d authored by Louis Chang's avatar Louis Chang
Browse files

Prevent IndexOutOfBoundsException while removing activities 

IndexOutOfBoundsException was thrown when traversing the Task
from bottom to top because the activity could be removed from
the Task and the activities are less than its original size.

Bug: 260643770
Test: 1) Start multiple activities in a Task
      2) Swipe up to home
      3) Kill the app process from shell
      4) Remove the task from Recents
Change-Id: I64955415c04da30d7dc8a4681474ceb06db1e88b
parent 615213dd

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

+12 −5
Original line number Diff line number Diff line
@@ -1591,15 +1591,22 @@ class Task extends TaskFragment { 
                removeChild(r, reason);

            });

        } else {

            final ArrayList<ActivityRecord> finishingActivities = new ArrayList<>();

            forAllActivities(r -> {

                if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) {

                    return;

                }

                finishingActivities.add(r);

            });



            // Finish or destroy apps from the bottom to ensure that all the other activity have

            // been finished and the top task in another task gets resumed when a top activity is

            // removed. Otherwise, the next top activity could be started while the top activity

            // is removed, which is not necessary since the next top activity is on the same Task

            // and should also be removed.

            forAllActivities((r) -> {

                if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) {

                    return;

                }

            for (int i = finishingActivities.size() - 1; i >= 0; i--) {

                final ActivityRecord r = finishingActivities.get(i);



                // Prevent the transition from being executed too early if the top activity is

                // resumed but the mVisibleRequested of any other activity is true, the transition

                // should wait until next activity resumed.
@@ -1609,7 +1616,7 @@ class Task extends TaskFragment { 
                } else {

                    r.destroyIfPossible(reason);

                }

            }, false /* traverseTopToBottom */);

            }

        }

    }