remove Surface uses in favor of IGraphicBufferProducer

Change-Id: I0d52884fbe80aa7f29f71bfbedd62162601a1360
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index bd956a6..a315dc3 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -957,7 +957,7 @@
         }
     }
 
-    if ( recorder->setPreviewSurface( surfaceControl->getSurface() ) < 0 ) {
+    if ( recorder->setPreviewSurface( surfaceControl->getSurface()->getIGraphicBufferProducer() ) < 0 ) {
         printf("error while configuring preview surface\n");
 
         return -1;
@@ -1080,7 +1080,7 @@
         params.setPictureSize(captureSize[captureSizeIDX].width, captureSize[captureSizeIDX].height);
 
         camera->setParameters(params.flatten());
-        camera->setPreviewDisplay(previewSurface);
+        camera->setPreviewTexture(previewSurface->getIGraphicBufferProducer());
 
         if(!hardwareActive) prevcnt = 0;