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

Commit adddeb39 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Defer remove splash screen window if it is inTransition." into udc-dev am: 778e47bb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22494388



Change-Id: Iaea6ade93dcef77e580b240ce8cf8bc2dd9891ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 569f2a17 778e47bb

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

+2 −4
Original line number Diff line number Diff line
@@ -2865,11 +2865,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return;

        }



        if (animate && mTransitionController.inCollectingTransition(startingWindow)

                && startingWindow.cancelAndRedraw()) {

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

            // Defer remove starting window after transition start.

            // If splash screen window was in collecting, the client side is unable to draw because

            // of Session#cancelDraw, which will blocking the remove animation.

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

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

                synchronized (mAtmService.mGlobalLock) {

                    surface.remove(true);