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

Commit 9c1353ee authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 20553036: am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task" 

* commit '20553036':
  [ActivityManager] Fix index OOB when resetting removed task
parents a34a3bdc 20553036

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

+5 −3
Original line number Diff line number Diff line
@@ -2508,9 +2508,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