Merge "Revert "Check if activity entering PiP is a top activity"" into main

1 files changed, 0 insertions, 6 deletions

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index d169b1eafd4c..3ac91b3068b8 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -3292,12 +3292,6 @@ 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())) {