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

Commit 45e6c5ef authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Remove starting window via legacy method before the display is ready. 

If the display isn't ready, Core won't send the transition ready and
the rest of the events to Shell. Therefore, the starting window should
be removed via legacy method, without depending on Shell.

Flag: com.android.window.flags.remove_starting_in_transition
Bug: 418904148
Test: Launch an app during mActivityManager.bootAnimationComplete(),
verify the splash screen will be removed without transition.
Change-Id: Ibe407195c69797e0f6e2c7e6fda766fae5bc58a2
parent b18f46dc

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

+2 −2
Original line number Diff line number Diff line
@@ -639,10 +639,10 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
        info.taskSnapshot = taskSnapshot;

        info.appToken = activity.token;

        final Transition collecting = activity.mTransitionController.getCollectingTransition();

        if (collecting != null) {

        if (collecting != null && !activity.mTransitionController.mIsWaitingForDisplayEnabled) {

            info.transitionToken = collecting.getToken();

        } else {

            Slog.w(TAG, "The starting window is created without transition?");

            Slog.w(TAG, "The starting window is created without transition.");

        }

        // make this happen prior than prepare surface

        try {

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

+4 −0
Original line number Diff line number Diff line
@@ -2112,6 +2112,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        if (!Flags.removeStartingInTransition()) {

            return;

        }

        // Skip if player is not enabled.

        if (!mIsPlayerEnabled) {

            return;

        }

        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();

            if (ar == null || ar.mStartingData == null || ar.mStartingSurface == null