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

Commit d916796b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
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
parents 98ac3bf2 73488550

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

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

        }

        final RemoteAnimationAdapter adapter =

        final RemoteAnimationAdapter adapter =

                getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

                getRemoteAnimationOverride(animLpActivity, transit, activityTypes);

        if (adapter != null) {

        if (adapter != null

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

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);

        }

        }

    }

    }