Merge "Reset SurfaceControl when reapplying magnification spec" am: 8afb2bf120 am: 7f70fe2963

Change-Id: I9159d11344cd9648b24b2b15436e8ac290102d97
2019-12-30 20:24:37 +00:00
parent 000011d3e8 7f70fe2963
commit a11a36187c
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);
            }