Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-qpr-dev am: 4c61bbfe4a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17743157

Change-Id: I39ff9632f48151a8635eac9f8278e111ca76e47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-04-18 04:28:51 +00:00
committed by Automerger Merge Worker
parent 441999bf01 4c61bbfe4a
commit e15dd1ff0d
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -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;
if (singleActivity) {
rootTask = task;

8
services/core/java/com/android/server/wm/Task.java
View File

@@ -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.
*/