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

Commit d8282f6c authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Check if activity entering PiP is a top activity" 

This reverts commit de1edcda.

Reason for revert: Droidmonitor created revert due to b/360185206. Will be verifying through ABTD before submission.

Change-Id: I49391afbcfcac35a91d6e2f2e254f2b221b80649
parent de1edcda

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

+0 −6
Original line number Diff line number Diff line
@@ -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())) {