Camera: Take picture with parameters in camera_test

takePictureWithParameters() is now a separate method in Camera
interface.

Change-Id: I9cda61d2d1e80d193047cb4fceabdbbea27a5191
Signed-off-by: Daniel Levin <dendy@ti.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h
index 0fc8634..1fc4baf 100644
--- a/test/CameraHal/camera_test.h
+++ b/test/CameraHal/camera_test.h
@@ -427,7 +427,7 @@ protected:
             ShotParameters shotParams;
             calcNextSingleExpGainPreset(mExpBracketIdx, mExp, mGain),
             setSingleExpGainPreset(shotParams, mExpBracketIdx, mExp, mGain);
-            mCamera->takePicture(0, shotParams.flatten());
+            mCamera->takePictureWithParameters(0, shotParams.flatten());
         }
     }
 protected:
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index d8006e6..4a42ede 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -3406,7 +3406,7 @@ int functional_menu() {
                 gettimeofday(&picture_start, 0);
                 if ( hardwareActive ) {
                     camera->setParameters(params.flatten());
-                    camera->takePicture(msgType, shotParams.flatten());
+                    camera->takePictureWithParameters(msgType, shotParams.flatten());
                 }
             }
             break;
diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp
index 5540998..ccbefbc 100644
--- a/test/CameraHal/camera_test_script.cpp
+++ b/test/CameraHal/camera_test_script.cpp
@@ -1181,7 +1181,7 @@ int execute_functional_script(char *script) {
                             printf("Error returned while setting parameters");
                             break;
                         }
-                        ret = camera->takePicture(msgType, shotParams.flatten());
+                        ret = camera->takePictureWithParameters(msgType, shotParams.flatten());
                         if ( ret != NO_ERROR ) {
                             printf("Error returned while taking a picture");
                             break;