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

Commit 68694780 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Fix index OOB when resetting removed task"

parents a6ed1b95 1d7919a7

services/core/java/com/android/server/am/ActivityStack.java

+5 −3
Original line number Diff line number Diff line
@@ -2445,9 +2445,11 @@ final class ActivityStack { 
        }



        int taskNdx = mTaskHistory.indexOf(task);

        if (taskNdx >= 0) {

            do {

                taskTop = mTaskHistory.get(taskNdx--).getTopActivity();

            } while (taskTop == null && taskNdx >= 0);

        }



        if (topOptions != null) {

            // If we got some ActivityOptions from an activity on top that