From ba6e1e5afad6147b10b0d6d751cb4d5f47a9acdf Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Thu, 15 Mar 2018 17:03:55 -0700
Subject: [PATCH] Fix resetting of wallpaper offset.

In the initial implementation I had hoped to eliminate
this call to set position, and when I had to add it back
I forgot to restore the wallpaper offseting. Anyway, setWallpaperOffset
sets this position and we need to make sure its not fighting with
setSurfaceBoundaries.

Bug: 74500386
Test: Manual. go/wm-smoke
Change-Id: Iac5d157090ea512acbe4892d57eee6e1e423f18d
---
 .../core/java/com/android/server/wm/WindowStateAnimator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 13f05e088cb1e..62d93294f7e2e 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -981,7 +981,7 @@ class WindowStateAnimator {
             mForceScaleUntilResize = true;
         } else {
             if (!w.mSeamlesslyRotated) {
-                mSurfaceController.setPositionInTransaction(0, 0, recoveringMemory);
+                mSurfaceController.setPositionInTransaction(mXOffset, mYOffset, recoveringMemory);
             }
         }