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

Commit c18b4270 authored by wilsonshih's avatar wilsonshih
Browse files

Fixes splash screen get removed directly without passing to client. 

Fix regression from ag/29645700.
If an app has request to copy splash screen, and removeStartingWindow
was called before transition finish, transferSplashScreenIfNeeded will
set mRemoveAfterTransaction to AFTER_TRANSACTION_COPY_TO_CLIENT.
But then when transition finish, transferSplashScreenIfNeeded shouldn't
skip requestCopySplashScreen.

Flag: EXEMPT bugfix
Bug: 381319359
Test: run "atest SplashscreenTests" more than 10 times
Change-Id: Ia6c530b15d43e85cdbaa194054defd864e96e903
parent 17408328

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

+2 −1
Original line number Diff line number Diff line
@@ -2650,7 +2650,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                // Skip copy splash screen to client if it was resized, or the starting data already

                // requested to be removed after transaction commit.

                || (mStartingData != null && (mStartingData.mResizedFromTransfer

                        || mStartingData.mRemoveAfterTransaction != AFTER_TRANSACTION_IDLE))

                        || mStartingData.mRemoveAfterTransaction

                        == AFTER_TRANSACTION_REMOVE_DIRECTLY))

                || isRelaunching()) {

            return false;

        }