From 58c018463e47eae9791ad79b1376abc7ba802512 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Fri, 25 Jun 2021 16:06:22 -0700
Subject: [PATCH] WindowState: Correct simple scaling error

We failed to record the scale we actually set at the caching level
leading to confusion.

Bug: 191947432
Test: Open app from bug, lock screen.
Change-Id: I13bf6a1821f235271ca0efa5dde1cae6a3b4d72c
---
 services/core/java/com/android/server/wm/WindowState.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index bba50a75a3b93..c3fc99554bcc8 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5477,8 +5477,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;
         }
     }