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

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

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

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

Change-Id: I5549e59635a55214c6b483d6028556bb4fe324a3
parents 3fd6972e a56e6c1f

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;

        }