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

Commit 6ac7eb36 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev... 

Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50 am: 96a6b4aa

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



Change-Id: I07f653a44483d343397f086e0da603a70dc7ba6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbb13e73 96a6b4aa

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

+9 −7
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public class AppTransitionController { 
    private final DisplayContent mDisplayContent;

    private final WallpaperController mWallpaperControllerLocked;

    private RemoteAnimationDefinition mRemoteAnimationDefinition = null;

    private static final int KEYGUARD_GOING_AWAY_ANIMATION_DURATION = 400;



    private static final int TYPE_NONE = 0;

    private static final int TYPE_ACTIVITY = 1;
@@ -727,14 +726,17 @@ public class AppTransitionController { 
     */

    private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity,

            @TransitionOldType int transit, ArraySet<Integer> activityTypes) {

        RemoteAnimationAdapter adapter = null;

        if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) {

            // The crash transition has higher priority than any involved remote animations.

            return;

        } else if (AppTransition.isKeyguardGoingAwayTransitOld(transit)) {

            adapter = mRemoteAnimationDefinition != null

                    ? mRemoteAnimationDefinition.getAdapter(transit, activityTypes)

                    : null;

        } else if (mDisplayContent.mAppTransition.getRemoteAnimationController() == null) {

            adapter = getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

        }

        final RemoteAnimationAdapter adapter =

                getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

        if (adapter != null

                && mDisplayContent.mAppTransition.getRemoteAnimationController() == null) {

        if (adapter != null) {

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

        }

    }