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

Commit 4d95b393 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: 46e8e0f2

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



Change-Id: I1b8ce7c3fc47424151f15fe6fe178dbfbbd266bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6992b438 46e8e0f2

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

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

    private final DisplayContent mDisplayContent;

    private final WallpaperController mWallpaperControllerLocked;

    private final WallpaperController mWallpaperControllerLocked;

    private RemoteAnimationDefinition mRemoteAnimationDefinition = null;

    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_NONE = 0;

    private static final int TYPE_ACTIVITY = 1;

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

     */

    private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity,

    private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity,

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

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

        RemoteAnimationAdapter adapter = null;

        if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) {

        if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) {

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

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

        if (adapter != null) {

                getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

        if (adapter != null

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

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

        }

        }

    }

    }