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

2021-08-09 17:31:38 +00:00
parent 49f2c7c5d1 0fd13e8499
commit a9d207945e
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/AppTransitionController.java
+++ b/services/core/java/com/android/server/wm/AppTransitionController.java
@@ -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);
        }
    }