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

Commit b304704a authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix aborting transition when deliver to top bellow transient launch"... 

Merge "Fix aborting transition when deliver to top bellow transient launch" into udc-dev am: 69e0c717

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



Change-Id: Id64e06fd5d2d227ae1384c9dea6400e15793db6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b7654b6 69e0c717

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

+4 −2
Original line number Diff line number Diff line
@@ -1573,8 +1573,10 @@ class ActivityStarter { 
            // existence change.

            transitionController.collectExistenceChange(started);

        } else if (result == START_DELIVERED_TO_TOP && newTransition != null

                // An activity has changed order/visibility so this isn't just deliver-to-top

                && mMovedToTopActivity == null) {

                // An activity has changed order/visibility or the task is occluded by a transient

                // activity, so this isn't just deliver-to-top

                && mMovedToTopActivity == null

                && !transitionController.isTransientHide(startedActivityRootTask)) {

            // We just delivered to top, so there isn't an actual transition here.

            if (!forceTransientTransition) {

                newTransition.abort();