Merge "WindowState: Correct simple scaling error" into sc-dev am: 52b8c91862 am: f9a199afc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114870 Change-Id: I1c5627c080fa21fc9627b9b922521986827d9406
2021-06-28 18:06:53 +00:00
parent e16bc9847e f9a199afc6
commit 2857f5ebd1
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5512,8 +5512,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
            getPendingTransaction().setMatrix(getSurfaceControl(),
                newHScale, 0, 0, newVScale);
            mLastGlobalScale = mGlobalScale;
-            mLastHScale = mHScale;
-            mLastVScale = mVScale;
+            mLastHScale = newHScale;
+            mLastVScale = newVScale;
        }
    }