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

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

Merge "Do not transfer the starting window if it is attached to client." into main

parents 01fc9676 44a440e4

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

+4 −1
Original line number Diff line number Diff line
@@ -2605,7 +2605,6 @@ final class ActivityRecord extends WindowToken { 
        removeTransferSplashScreenTimeout();

        // Client has draw the splash screen, so we can remove the starting window.

        if (mStartingWindow != null) {

            mStartingWindow.cancelAnimation();

            mStartingWindow.hide(false, false);

        }

        // no matter what, remove the starting window.
@@ -4487,6 +4486,10 @@ final class ActivityRecord extends WindowToken { 
                return false;

            }



            if (fromActivity.mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_IDLE) {

                return false;

            }



            // If another activity above the activity which has starting window, allows to steal the

            // starting window if the above activity isn't drawn.

            if (task.getChildCount() >= 3