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

Commit 26a8a983 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

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

parents 47b0a3cd bf2b82be

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 activity is top activity of its task fragment - this prevents any trampolines

        // followed by enterPictureInPictureMode() calls by an activity from below in its stack.

        if (getTaskFragment() == null || getTaskFragment().getTopNonFinishingActivity() != this) {

            return false;

        }



        // Check to see if PiP is supported for the display this container is on.

        if (mDisplayContent != null && !mDisplayContent.mDwpcHelper.isEnteringPipAllowed(

                getUid())) {