Merge "don't call setSize() when creating SurfaceControl" am: 57e98b19be am: e332fe4b3d

am: 762b60ce74 Change-Id: I0fd2cc4e3edf9a5ee2e52b45c00368ae165e2c40
2018-07-24 22:25:57 -07:00
parent ad2d40365e 762b60ce74
commit 607244a1fb
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -579,7 +579,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
                                    0.0f, 0.0f,
                                    mScreenRect.height() / (float) mSurfaceHeight);
                        }
-                        if (sizeChanged) {
+                        if (sizeChanged && !creating) {
                            mSurfaceControl.setSize(mSurfaceWidth, mSurfaceHeight);
                        }
                    } finally {