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

Commit 0b3a814e authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22649681



Change-Id: Ic85011d5b32f3a6b260b37ba919b6f4d24eb9bf5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64230649 43967d16

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

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

                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 {

            if (!appTransition.isTransitionSet()

                    && appTransition.isReady()) {