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

Commit 1900cef3 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 am: 3e11b95a

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



Change-Id: I2428f2bc98228d1e424e7555957143a8b852e1e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32e90651 3e11b95a

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

+6 −7
Original line number Diff line number Diff line
@@ -2712,12 +2712,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();

            }
@@ -2725,9 +2727,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,