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

2018-07-25 02:31:13 +00:00
parent c77d25e441 4dde7d19cb
commit 57e98b19be
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -572,7 +572,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 {