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

Commit 11038d36 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 am: 31d370cf

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



Change-Id: Ic925b577819f5a083380b9dfd714130e3b4ab085
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2bc6d9a 31d370cf

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

+4 −2
Original line number Diff line number Diff line
@@ -1572,8 +1572,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();