Merge "don't call setSize() when creating SurfaceControl"

am: 57e98b19be Change-Id: Iec44550e5c18fa7d3005c8c79e607fc1bc656c13
2018-07-24 22:01:41 -07:00
parent 0519a19f48 57e98b19be
commit e332fe4b3d
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 {