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

Commit fe319b3a authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Remove starting window via legacy method before the display is ready." into main

parents dc43d11a 45e6c5ef

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
@@ -2120,6 +2120,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