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

Commit e0514dca authored Jul 20, 2023 by TreeHugger Robot Committed by Automerger Merge Worker Jul 20, 2023

Merge "Request transition when PIP is removed" into udc-qpr-dev am: 1e68575d

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

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

parents 245da56e 1e68575d

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2201,7 +2201,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
	displaySwapping \|= s.isDisplaySleepingAndSwapping();		displaySwapping \|= s.isDisplaySleepingAndSwapping();
	ProtoLog.v(WM_DEBUG_STATES, "Stopping %s: nowVisible=%b animating=%b "		ProtoLog.v(WM_DEBUG_STATES, "Stopping %s: nowVisible=%b animating=%b "
	+ "finishing=%s", s, s.nowVisible, animating, s.finishing);		+ "finishing=%s", s, s.nowVisible, animating, s.finishing);
	if ((!animating && !displaySwapping) \|\| mService.mShuttingDown) {		if ((!animating && !displaySwapping) \|\| mService.mShuttingDown
			\|\| s.getRootTask().isForceHiddenForPinnedTask()) {
	if (!processPausingActivities && s.isState(PAUSING)) {		if (!processPausingActivities && s.isState(PAUSING)) {
	// Defer processing pausing activities in this iteration and reschedule		// Defer processing pausing activities in this iteration and reschedule
	// a delayed idle to reprocess it again		// a delayed idle to reprocess it again

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4504,6 +4504,10 @@ class Task extends TaskFragment {
	return mForceHiddenFlags != 0;		return mForceHiddenFlags != 0;
	}		}

			boolean isForceHiddenForPinnedTask() {
			return (mForceHiddenFlags & FLAG_FORCE_HIDDEN_FOR_PINNED_TASK) != 0;
			}

	@Override		@Override
	protected boolean isForceTranslucent() {		protected boolean isForceTranslucent() {
	return mForceTranslucent;		return mForceTranslucent;