diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 6f69e0324b0b..22714c6f5593 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2007,8 +2007,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> r.getDisplayContent().prepareAppTransition(TRANSIT_NONE); final TaskFragment organizedTf = r.getOrganizedTaskFragment(); - // TODO: Does it make sense to only count non-finishing activities? - final boolean singleActivity = task.getActivityCount() == 1; + final boolean singleActivity = task.getNonFinishingActivityCount() == 1; final Task rootTask; if (singleActivity) { rootTask = task; diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index bd078d880980..9ea566ece6ec 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1380,14 +1380,6 @@ class Task extends TaskFragment { return getActivity(ActivityRecord::canBeTopRunning); } - int getActivityCount() { - final int[] activityCount = new int[1]; - forAllActivities(ar -> { - activityCount[0]++; - }); - return activityCount[0]; - } - /** * Return true if any activities in this task belongs to input uid. */ |