Move ScreenRotationAnimation to DisplayContent
Move the reference to the ScreenRotationAnimation from WindowAnimator to
DisplayContent now that the animation runs on the
SurfaceAnimationRunner.
Next step is to delete the DisplayContentsAnimator class in
WindowAnimator.
Bug: 131727512
Test: WmTests
Change-Id: I7c9994eebcf95ae0f329c65e39832c18f025101d
diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java
index 6b2f9da..59f086e 100644
--- a/services/core/java/com/android/server/wm/AppTransitionController.java
+++ b/services/core/java/com/android/server/wm/AppTransitionController.java
@@ -449,9 +449,9 @@
"Checking " + apps.size() + " opening apps (frozen="
+ mService.mDisplayFrozen + " timeout="
+ mDisplayContent.mAppTransition.isTimeout() + ")...");
- final ScreenRotationAnimation screenRotationAnimation =
- mService.mAnimator.getScreenRotationAnimationLocked(
- Display.DEFAULT_DISPLAY);
+
+ final ScreenRotationAnimation screenRotationAnimation = mService.mRoot.getDisplayContent(
+ Display.DEFAULT_DISPLAY).getRotationAnimation();
if (!mDisplayContent.mAppTransition.isTimeout()) {
// Imagine the case where we are changing orientation due to an app transition, but a