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

Commit cab89d64 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Shell transitions not received when activity already open on another display" into main

parents 5999affa 43b2500a

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

+3 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,8 @@ class ActivityStarter { 
                // activity, so this isn't just deliver-to-top

                && mMovedToTopActivity == null

                && !transitionController.hasOrderChanges()

                && !transitionController.isTransientHide(startedActivityRootTask)) {

                && !transitionController.isTransientHide(startedActivityRootTask)

                && !newTransition.hasChanged(mLastStartActivityRecord)) {

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

            if (!forceTransientTransition) {

                newTransition.abort();
@@ -1792,6 +1793,7 @@ class ActivityStarter { 
                    activity.destroyIfPossible("Removes redundant singleInstance");

                }

            }

            targetTaskTop.mTransitionController.collect(targetTaskTop);

            recordTransientLaunchIfNeeded(targetTaskTop);

            // Recycle the target task for this launch.

            startResult =

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

+6 −0
Original line number Diff line number Diff line
@@ -3231,6 +3231,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_WINDOW_MANAGER, TAG, cookie);

    }



    boolean hasChanged(WindowContainer wc) {

        final ChangeInfo chg = mChanges.get(wc);

        if (chg == null) return false;

        return chg.hasChanged();

    }



    @VisibleForTesting

    static class ChangeInfo {

        private static final int FLAG_NONE = 0;