diff options
author | Tyler Gunn <tgunn@google.com> | 2016-02-18 21:39:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-18 21:39:15 +0000 |
commit | e48a21ac3555da836b5e594ec8444ff6cd5c8e42 (patch) | |
tree | edc7d4e6ae45b84ce02e2abb5244e8456355fc3f /InCallUI | |
parent | c9755cd2be5179d1b5af2a85378c13c3010fdd67 (diff) | |
parent | a3e5164c532488b2a20deb6cdccb54b919c0a110 (diff) |
Merge "IMS-VT: Do not create new surface when setting surface dimensions" into nyc-dev am: 73fb5b37a7
am: a3e5164c53
* commit 'a3e5164c532488b2a20deb6cdccb54b919c0a110':
IMS-VT: Do not create new surface when setting surface dimensions
Diffstat (limited to 'InCallUI')
-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); } } |