From 556fbf2671a0a0d173567d123f00394f69f4737c Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Fri, 7 Apr 2023 11:07:38 +0800 Subject: [PATCH] Correct parameter order when calling setCustomAnimation. Only affect predict-back animation. Bug: 259427810 Test: manual, call overrideActivityTransition for close transition, verify when predict-back animation happen, the exit animation is apply to the exit activity. Test: atest ActivityTransitionTests BackNavigationControllerTests\ CustomizeActivityAnimationTest Change-Id: I5ddfc6e674deb7b3bfcd7365d525ec6d03c525ac --- .../java/com/android/server/wm/BackNavigationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 587e7204f9930..934aa5d0f9b88 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -286,8 +286,8 @@ class BackNavigationController { currentActivity.getCustomAnimation(false/* open */); if (customAppTransition != null) { infoBuilder.setCustomAnimation(currentActivity.packageName, - customAppTransition.mExitAnim, customAppTransition.mEnterAnim, + customAppTransition.mExitAnim, customAppTransition.mBackgroundColor); } }