Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev (1b59b7d4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStack.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2882,8 +2882,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
	} else {		} else {
	// If a new task is being launched, then mark the existing top activity as		// If a new task is being launched, then mark the existing top activity as
	// supporting picture-in-picture while pausing		// supporting picture-in-picture while pausing
	if (focusedTopActivity != null &&		if (focusedTopActivity != null
	focusedTopActivity.getStack().getStackId() != PINNED_STACK_ID) {		&& focusedTopActivity.getStackId() != PINNED_STACK_ID
			&& r.getStackId() != ASSISTANT_STACK_ID) {
	focusedTopActivity.supportsPictureInPictureWhilePausing = true;		focusedTopActivity.supportsPictureInPictureWhilePausing = true;
	}		}
	transit = TRANSIT_TASK_OPEN;		transit = TRANSIT_TASK_OPEN;
	@@ -4549,7 +4550,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
	}		}
	// If a new task is moved to the front, then mark the existing top activity as supporting		// If a new task is moved to the front, then mark the existing top activity as supporting
	// picture-in-picture while paused		// picture-in-picture while paused
	if (topActivity != null && topActivity.getStack().getStackId() != PINNED_STACK_ID) {		if (topActivity != null && topActivity.getStackId() != PINNED_STACK_ID
			&& tr.getStackId() != ASSISTANT_STACK_ID) {
	topActivity.supportsPictureInPictureWhilePausing = true;		topActivity.supportsPictureInPictureWhilePausing = true;
	}		}