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

Commit 3be70132 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Report legacyStart for all displays legacyPending reported" into main

parents 34d2d21f f2c5c500

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1947,7 +1947,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        mCleanupTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get();

        mCleanupTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get();

        buildCleanupTransaction(mCleanupTransaction, info);

        buildCleanupTransaction(mCleanupTransaction, info);

        if (mController.getTransitionPlayer() != null && mIsPlayerEnabled) {

        if (mController.getTransitionPlayer() != null && mIsPlayerEnabled) {

            mController.dispatchLegacyAppTransitionStarting(info, mStatusBarTransitionDelay);

            mController.dispatchLegacyAppTransitionStarting(participantDisplays,

                    mStatusBarTransitionDelay);

            try {

            try {

                ProtoLog.v(WmProtoLogGroups.WM_DEBUG_WINDOW_TRANSITIONS,

                ProtoLog.v(WmProtoLogGroups.WM_DEBUG_WINDOW_TRANSITIONS,

                        "Calling onTransitionReady: %s", info);

                        "Calling onTransitionReady: %s", info);

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -1356,12 +1356,13 @@ class TransitionController { 
        }

        }

    }

    }





    void dispatchLegacyAppTransitionStarting(TransitionInfo info, long statusBarTransitionDelay) {

    void dispatchLegacyAppTransitionStarting(DisplayContent[] participantDisplays,

            long statusBarTransitionDelay) {

        final long now = SystemClock.uptimeMillis();

        final long now = SystemClock.uptimeMillis();

        for (int i = 0; i < mLegacyListeners.size(); ++i) {

        for (int i = 0; i < mLegacyListeners.size(); ++i) {

            final WindowManagerInternal.AppTransitionListener listener = mLegacyListeners.get(i);

            final WindowManagerInternal.AppTransitionListener listener = mLegacyListeners.get(i);

            for (int j = 0; j < info.getRootCount(); ++j) {

            for (int j = 0; j < participantDisplays.length; ++j) {

                final int displayId = info.getRoot(j).getDisplayId();

                final int displayId = participantDisplays[j].mDisplayId;

                if (shouldDispatchLegacyListener(listener, displayId)) {

                if (shouldDispatchLegacyListener(listener, displayId)) {

                    listener.onAppTransitionStartingLocked(

                    listener.onAppTransitionStartingLocked(

                            now + statusBarTransitionDelay,

                            now + statusBarTransitionDelay,