commit 10f24e506f508599396f31b8d58f70ac5555f354
author Wu-cheng Li <wuchengli@google.com> Thu Apr 19 12:36:39 2012 +0800
committer Wu-cheng Li <wuchengli@google.com> Thu Apr 19 12:36:39 2012 +0800
tree 82ed44df22b72d97fb6942db5c1e8a68853d4edc
parent d3ed7e4851d939d3952be692930bfd13556b26ac

Revert "Use new camera connect api."

This reverts commit ab9ef43721796d6ee4b35ab4614be0210a189fe4.

test/CameraHal/camera_test_menu.cpp

diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index eb78f0f..1430ea4 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -1013,13 +1013,13 @@
 
 int openCamera() {
     printf("openCamera(camera_index=%d)\n", camera_index);
-    camera = Camera::connect(camera_index, false, false);
+    camera = Camera::connect(camera_index);
 
     if ( NULL == camera.get() ) {
         printf("Unable to connect to CameraService\n");
         printf("Retrying... \n");
         sleep(1);
-        camera = Camera::connect(camera_index, false, false);
+        camera = Camera::connect(camera_index);
 
         if ( NULL == camera.get() ) {
             printf("Giving up!! \n");
@@ -1456,10 +1456,10 @@
                 stopRecording();
                 closeRecorder();
 
-                camera = Camera::connect(camera_index, false, false);
+                camera = Camera::connect(camera_index);
                   if ( NULL == camera.get() ) {
                       sleep(1);
-                      camera = Camera::connect(camera_index, false, false);
+                      camera = Camera::connect(camera_index);
                       if ( NULL == camera.get() ) {
                           return -1;
                       }

test/CameraHal/camera_test_script.cpp

diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp
index d8c2fb1..afd88be 100644
--- a/test/CameraHal/camera_test_script.cpp
+++ b/test/CameraHal/camera_test_script.cpp
@@ -237,10 +237,10 @@
                     stopRecording();
                     closeRecorder();
 
-                    camera = Camera::connect(camera_index, false, false);
+                    camera = Camera::connect(camera_index);
                       if ( NULL == camera.get() ) {
                           sleep(1);
-                          camera = Camera::connect(camera_index, false, false);
+                          camera = Camera::connect(camera_index);
 
                           if ( NULL == camera.get() ) {
                               return -1;