summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyanka Advani (xWF) <padvani@google.com> 2024-08-15 21:09:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-08-15 21:09:31 +0000
commitd8282f6c09364d1923879237e5abc8938f133f1a (patch)
tree916464518471323519ea0aca1faf872034ebc772
parentde1edcda5d5efc257115506bd532c52ce7b47dfc (diff)
Revert "Check if activity entering PiP is a top activity"
This reverts commit de1edcda5d5efc257115506bd532c52ce7b47dfc. Reason for revert: Droidmonitor created revert due to b/360185206. Will be verifying through ABTD before submission. Change-Id: I49391afbcfcac35a91d6e2f2e254f2b221b80649
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java6
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 5500229af7be..5c096ecbba04 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())) {