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

Commit 77eb8260 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Set client invisible immediately for trampoline with window"... 

Merge "Merge "Set client invisible immediately for trampoline with window" into udc-dev am: 0a5094e8 am: 43967d16"
parents 1bb27f1c 0b3a814e

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -5315,6 +5315,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            if (finishing || isState(STOPPED)) {

            if (finishing || isState(STOPPED)) {

                displayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this);

                displayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this);

            }

            }

            // Because starting window was transferred, this activity may be a trampoline which has

            // been occluded by next activity. If it has added windows, set client visibility

            // immediately to avoid the client getting RELAYOUT_RES_FIRST_TIME from relayout and

            // drawing an unnecessary frame.

            if (startingMoved && !firstWindowDrawn && hasChild()) {

                setClientVisible(false);

            }

        } else {

        } else {

            if (!appTransition.isTransitionSet()

            if (!appTransition.isTransitionSet()

                    && appTransition.isReady()) {

                    && appTransition.isReady()) {