commit 8afb2bf120847f56b9e488624e5e527227e2c134
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 30 07:51:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 30 07:51:39 2019 +0000
tree 1e9fa1f401c6818db2510dacec4ccb2da3322587
parent b73052d94da7ddcf69cdb32626a2b81e014b43d4
parent ae2002a25ed49c721010acf95ba827dce31b1a8d

Merge "Reset SurfaceControl when reapplying magnification spec"

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

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index f77e1b7..1a3704e 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -1190,6 +1190,7 @@
                     .setPosition(mSurfaceControl, spec.offsetX, spec.offsetY);
             mLastMagnificationSpec = spec;
         } else {
+            clearMagnificationSpec(t);
             for (int i = 0; i < mChildren.size(); i++) {
                 mChildren.get(i).applyMagnificationSpec(t, spec);
             }