diff options
author | Tyler Gunn <tgunn@google.com> | 2016-02-18 21:24:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-18 21:24:44 +0000 |
commit | 73fb5b37a7b49995f7a5ce7e99d637ac9c042c0e (patch) | |
tree | 46590b27f747fa456fe6319b8767b118f43e9aed | |
parent | ebddd94caf89f92be5908d71325651864575414f (diff) | |
parent | ca7547b154cfa98e922601ac42ca61f77db39cd4 (diff) |
Merge "IMS-VT: Do not create new surface when setting surface dimensions" into nyc-dev
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallFragment.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java index 2c063034a..f80b04c51 100644 --- a/InCallUI/src/com/android/incallui/VideoCallFragment.java +++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java @@ -371,9 +371,10 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter, mWidth = width; mHeight = height; - if (mSavedSurfaceTexture != null) { + if (width != DIMENSIONS_NOT_SET && height != DIMENSIONS_NOT_SET + && mSavedSurfaceTexture != null) { Log.d(this, "setSurfaceDimensions, mSavedSurfaceTexture is NOT equal to null."); - createSurface(width, height); + mSavedSurfaceTexture.setDefaultBufferSize(width, height); } } |