summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author youngmin0822.lee <youngmin0822.lee@lge.com> 2018-07-24 22:39:05 -0700
committer android-build-merger <android-build-merger@google.com> 2018-07-24 22:39:05 -0700
commitd673f4f271670fc5dd1e73d85b9a6009e052605e (patch)
tree26e8711cbf0fb0d810d221078cb6667164f59ef9
parentf91e5a984f232936cc916bc8a0f26b8585e8b196 (diff)
parent607244a1fb2d92d562ef9130683764278c48827b (diff)
Merge "don't call setSize() when creating SurfaceControl" am: 57e98b19be am: e332fe4b3d am: 762b60ce74
am: 607244a1fb Change-Id: I1b6ef96c0b9f15eda6296e5e9fbdb072f66d9b91
-rw-r--r--core/java/android/view/SurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index db34856e0ad6..44c1780d0be5 100644
--- 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 {