Merge "Reset SurfaceControl when reapplying magnification spec"

am: 8afb2bf120 Change-Id: I8177905fb8e7c1227d88534fc9235e57b4bb8663
2019-12-30 00:02:27 -08:00
parent 6625ced0fd 8afb2bf120
commit 7f70fe2963
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -1190,6 +1190,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
                    .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);
            }