From 3a89f88112a7cadde30484adc0ee2cd34509dbd2 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 14 Apr 2022 11:28:53 +0800 Subject: [PATCH] Only move Task to PiP if there is only one non-finishing activity Bug: 225371112 Test: pass existing Change-Id: I9c68e3932940b7932db5f1dd4045170e66aa2dba Merged-In: I9c68e3932940b7932db5f1dd4045170e66aa2dba --- .../java/com/android/server/wm/RootWindowContainer.java | 3 +-- services/core/java/com/android/server/wm/Task.java | 8 -------- 2 files changed, 1 insertion(+), 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 6f69e0324b0b0..22714c6f55937 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 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 bd078d880980a..9ea566ece6ec5 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. */