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

Commit aaef9132 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-e79376c595e84012896e46b94a9fa3c3" into... 

Merge changes from topic "presubmit-am-e79376c595e84012896e46b94a9fa3c3" into tm-mainline-prod am: dfab9a7b

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



Change-Id: If0d96d70d132b6eee1062ba1e35235903ed24d4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63e2270d dfab9a7b

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

+1 −1
Original line number Diff line number Diff line
@@ -6300,7 +6300,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // starting window is drawn, the transition can start earlier. Exclude finishing and bubble

        // because it may be a trampoline.

        if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble

                && !mDisplayContent.mAppTransition.isReady()

                && mVisibleRequested && !mDisplayContent.mAppTransition.isReady()

                && !mDisplayContent.mAppTransition.isRunning()

                && mDisplayContent.isNextTransitionForward()) {

            // The pending transition state will be cleared after the transition is started, so