Merge "Check if activity entering PiP is a top activity" into main (c44a74d0) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -3292,6 +3292,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return false;
		}

		// Check if this activity is the top activity of its task - this prevents any trampolines
		// followed by enterPictureInPictureMode() calls by an activity from below in its stack.
		if (getTask().getTopMostActivity() != this) {
		return false;
		}

		// Check to see if PiP is supported for the display this container is on.
		if (mDisplayContent != null && !mDisplayContent.mDwpcHelper.isEnteringPipAllowed(
		getUid())) {