commit fab471d1b3a71952cb9d1b080cc75463acf65ca7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 03:16:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 03:16:46 2020 +0000
tree 2555c49a5f957abf0c14fc9b35677f6b5e8e6b6c
parent 8acbb3a70ae6308ca408fdd6d7b75925c5978f00
parent 281e6cefb51be6516338e28fb4a6a3acbe672428

Merge "Use current display surface size for custom rotation animation" into rvc-dev am: 281e6cefb5

Change-Id: Ibe83c9be405b63aa9639d026ccd31340bb016993

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

diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index 5f33ea1..9d44cad 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -597,8 +597,8 @@
             return startAnimation(initializeBuilder()
                             .setSurfaceControl(mScreenshotLayer)
                             .setAnimationLeashParent(mDisplayContent.getOverlayLayer())
-                            .setWidth(mWidth)
-                            .setHeight(mHeight)
+                            .setWidth(mDisplayContent.getSurfaceWidth())
+                            .setHeight(mDisplayContent.getSurfaceHeight())
                             .build(),
                     createWindowAnimationSpec(mRotateAlphaAnimation),
                     this::onAnimationEnd);