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

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

Merge "Don't transfer splash screen if activity is finishing." into tm-dev

parents b473daa1 0d095c2a

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

+2 −1
Original line number Diff line number Diff line
@@ -2476,7 +2476,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    }



    private boolean transferSplashScreenIfNeeded() {

        if (!mHandleExitSplashScreen || mStartingSurface == null || mStartingWindow == null

        if (finishing || !mHandleExitSplashScreen || mStartingSurface == null

                || mStartingWindow == null

                || mTransferringSplashScreenState == TRANSFER_SPLASH_SCREEN_FINISH) {

            return false;

        }