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

Commit 3e11b95a authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Preventing pass null animation leash in TransferSplashScreenView" into... 

Merge "Preventing pass null animation leash in TransferSplashScreenView" into udc-qpr-dev am: 14faab88

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



Change-Id: I509de1b9b0f465ee69bdadc2802ba44ba8e2fcf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5ab5b63 14faab88

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

+6 −7
Original line number Diff line number Diff line
@@ -2717,12 +2717,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     */

    void onCopySplashScreenFinish(SplashScreenViewParcelable parcelable) {

        removeTransferSplashScreenTimeout();

        // unable to copy from shell, maybe it's not a splash screen. or something went wrong.

        // either way, abort and reset the sequence.

        if (parcelable == null

        final SurfaceControl windowAnimationLeash = (parcelable == null

                || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING

                || mStartingWindow == null || mStartingWindow.mRemoved

                || finishing) {

                || finishing) ? null

                : TaskOrganizerController.applyStartingWindowAnimation(mStartingWindow);

        if (windowAnimationLeash == null) {

            // Unable to copy from shell, maybe it's not a splash screen, or something went wrong.

            // Either way, abort and reset the sequence.

            if (parcelable != null) {

                parcelable.clearIfNeeded();

            }
@@ -2730,9 +2732,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            removeStartingWindow();

            return;

        }

        // schedule attach splashScreen to client

        final SurfaceControl windowAnimationLeash = TaskOrganizerController

                .applyStartingWindowAnimation(mStartingWindow);

        try {

            mTransferringSplashScreenState = TRANSFER_SPLASH_SCREEN_ATTACH_TO_CLIENT;

            mAtmService.getLifecycleManager().scheduleTransaction(app.getThread(), token,