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

Commit a11693c7 authored Apr 18, 2022 by Chris Li Committed by Automerger Merge Worker Apr 18, 2022

Merge "Only move Task to PiP if there is only one non-finishing activity" into...

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

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

Change-Id: I92942edd85b7932aa25facef9c2d23e0d1480268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d4e0bddb 99b30edb

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -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.
		*/