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

Commit c37c73c5 authored by Chaitanya Cheemala (xWF)'s avatar Chaitanya Cheemala (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Check AR state upon enter PiP collect" 

This reverts commit 375e47cf.

Reason for revert: Likely culprit for b/439527334 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 439527334
Change-Id: I051aa0ae369b72afc8a1cba23ae1053a8cb36f4d
parent 375e47cf

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

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



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

                    if (deferred && !r.checkEnterPictureInPictureState(

                            "enterPictureInPictureMode-collect", false /* beforeStopping */)) {

                        // If the transition was queued to collect, it is possible the PiP candidate

                        // activity isn't in a proper state to enter PiP anymore, so double check.

                        Slog.w(TAG, "PiP candidate activity in invalid state on transit collect");

                        enterPipTransition.abort();

                        return;

                    }



                    mChainTracker.start("enterPip2", enterPipTransition);

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

                    // Shell handles the request; see task supervisor's