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

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

Merge "Do not collect activity in finishTransition" into main

parents b9a67467 423ec2a6

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

+7 −1
Original line number Diff line number Diff line
@@ -9190,7 +9190,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    getRequestedOverrideWindowingMode() == WINDOWING_MODE_UNDEFINED

                            ? newParentConfig.windowConfiguration.getWindowingMode()

                            : getRequestedOverrideWindowingMode();

            if (getWindowingMode() != projectedWindowingMode) {

            if (getWindowingMode() != projectedWindowingMode

                    // Do not collect a pip activity about to enter pinned mode

                    // as a part of WindowOrganizerController#finishTransition().

                    // If not checked the activity might be collected for the wrong transition,

                    // such as a TRANSIT_OPEN transition requested right after TRANSIT_PIP.

                    && !(mWaitForEnteringPinnedMode

                    && mTransitionController.inFinishingTransition(this))) {

                mTransitionController.collect(this);

            }

        }