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

Commit d3d51665 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow ActivityOptions remote animation override per-display remote... 

Merge "Allow ActivityOptions remote animation override per-display remote animation." into sc-v2-dev am: d916796b

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

Change-Id: I326178647bcf2ca29df32ef4a44ef4ff8dd1a9cb
parents 7678bcd3 d916796b

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

+2 −1
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ public class AppTransitionController { 
        }

        final RemoteAnimationAdapter adapter =

                getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

        if (adapter != null) {

        if (adapter != null

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

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

        }

    }