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

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

Merge "Avoid send another copy splash screen request to shell." into main

parents 1eaa4676 27e6bf57

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

+5 −2
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ import static com.android.server.wm.IdentifierProto.HASH_CODE; 
import static com.android.server.wm.IdentifierProto.TITLE;

import static com.android.server.wm.IdentifierProto.USER_ID;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_COPY_TO_CLIENT;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_IDLE;

import static com.android.server.wm.StartingData.AFTER_TRANSACTION_REMOVE_DIRECTLY;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_PREDICT_BACK;
@@ -2635,8 +2636,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (finishing || !mHandleExitSplashScreen || mStartingSurface == null

                || mStartingWindow == null

                || mTransferringSplashScreenState == TRANSFER_SPLASH_SCREEN_FINISH

                // skip copy splash screen to client if it was resized

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

                // 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))

                || isRelaunching()) {

            return false;

        }