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

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

Merge "[PiP2] Do not stop PiP-ing activity" into main

parents d1f90110 a40cc071

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

+3 −0
Original line number Diff line number Diff line
@@ -3853,6 +3853,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


            getTransitionController().startCollectOrQueue(enterPipTransition, (deferred) -> {

                mChainTracker.start("enterPip2", enterPipTransition);

                // Collecting PiP activity explicitly to avoid stopping PiP activity while Shell

                // handles the request; see task supervisor's processStoppingAndFinishingActivities.

                enterPipTransition.collect(r);

                getTransitionController().requestStartTransition(enterPipTransition,

                        r.getTask(), null /* remoteTransition */, null /* displayChange */);

                mChainTracker.end();