commit 1a06f153563cdb03559821bd0f9771427a7c1570
author Wale Ogunwale <ogunwale@google.com> Fri Oct 11 11:26:30 2019 +0200
committer Wale Ogunwale <ogunwale@google.com> Fri Oct 11 15:19:47 2019 +0200
tree d5173918e27823e28cc77968fa76e485103db777
parent 0fd72921187fb93ebd6c582ee67f4c0595b5187e

Get TaskRecord children with getChildAt & co. APIs (54/n)

Helps reduce work with Task level unification.
Bug: 80414790
Test: Existing tests pass

Change-Id: I5e019c7d1f3ed50c4efd628b68fee6990841904d

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

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 750fc68..44d748d 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -1982,7 +1982,7 @@
                 final TaskRecord task = r.getTaskRecord();
                 int index = task.mActivities.lastIndexOf(r);
                 if (index > 0) {
-                    ActivityRecord under = task.mActivities.get(index - 1);
+                    ActivityRecord under = task.getChildAt(index - 1);
                     under.returningOptions = safeOptions != null ? safeOptions.getOptions(r) : null;
                 }
                 return r.setOccludesParent(false);