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

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);
             }
         }