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

Commit d7fb5d97 authored by wilsonshih's avatar wilsonshih
Browse files

Defer remove splash screen window until start transaction apply. 

In previous CL ag/22494388, there try to defer remove starting window
if it is in collect, which miss the case that transition may already
playing.
So in this CL, by override the waitForSyncTransactionCommit and
onSyncTransactionCommitted, there can defer remove starting window
until the starting transaction apply, which should ensure the surface
of app window is drawn.

Bug: 276692049
Test: manual launch app from notification shade several times, verify
no blank window occur.

Change-Id: I4ad3f4c892939ee70cbb544d63be03123c7425bc
parent 209bc17b

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

+28 −12
Original line number Diff line number Diff line
@@ -2822,6 +2822,27 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    @Override

    void waitForSyncTransactionCommit(ArraySet<WindowContainer> wcAwaitingCommit) {

        super.waitForSyncTransactionCommit(wcAwaitingCommit);

        if (mStartingData != null) {

            mStartingData.mWaitForSyncTransactionCommit = true;

        }

    }



    @Override

    void onSyncTransactionCommitted(SurfaceControl.Transaction t) {

        super.onSyncTransactionCommitted(t);

        if (mStartingData == null) {

            return;

        }

        mStartingData.mWaitForSyncTransactionCommit = false;

        if (mStartingData.mRemoveAfterTransaction) {

            mStartingData.mRemoveAfterTransaction = false;

            removeStartingWindowAnimation(mStartingData.mPrepareRemoveAnimation);

        }

    }



    void removeStartingWindowAnimation(boolean prepareAnimation) {

        mTransferringSplashScreenState = TRANSFER_SPLASH_SCREEN_IDLE;

        if (task != null) {
@@ -2844,6 +2865,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        final WindowState startingWindow = mStartingWindow;

        final boolean animate;

        if (mStartingData != null) {

            if (mStartingData.mWaitForSyncTransactionCommit

                    || mTransitionController.inCollectingTransition(startingWindow)) {

                mStartingData.mRemoveAfterTransaction = true;

                mStartingData.mPrepareRemoveAnimation = prepareAnimation;

                return;

            }

            animate = prepareAnimation && mStartingData.needRevealAnimation()

                    && mStartingWindow.isVisibleByPolicy();

            ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Schedule remove starting %s startingWindow=%s"
@@ -2864,19 +2891,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    this);

            return;

        }



        if (animate && mTransitionController.inCollectingTransition(startingWindow)) {

            // Defer remove starting window after transition start.

            // The surface of app window could really show after the transition finish.

            startingWindow.mSyncTransaction.addTransactionCommittedListener(Runnable::run, () -> {

                synchronized (mAtmService.mGlobalLock) {

                    surface.remove(true);

                }

            });

        } else {

        surface.remove(animate);

    }

    }



    /**

     * Reparents this activity into {@param newTaskFrag} at the provided {@param position}. The

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

+20 −0
Original line number Diff line number Diff line
@@ -41,6 +41,26 @@ public abstract class StartingData { 
    /** Whether the starting window is drawn. */

    boolean mIsDisplayed;



    /**

     * For Shell transition.

     * There will be a transition happen on attached activity, do not remove starting window during

     * this period, because the transaction to show app window may not apply before remove starting

     * window.

     * Note this isn't equal to transition playing, the period should be

     * Sync finishNow -> Start transaction apply.

     */

    boolean mWaitForSyncTransactionCommit;



    /**

     * For Shell transition.

     * This starting window should be removed after applying the start transaction of transition,

     * which ensures the app window has shown.

     */

    boolean mRemoveAfterTransaction;



    /** Whether to prepare the removal animation. */

    boolean mPrepareRemoveAnimation;



    protected StartingData(WindowManagerService service, int typeParams) {

        mService = service;

        mTypeParams = typeParams;