commit 15f4f11659750ce36832f55fe6dd7aa145daa6dd
author Glenn Kasten <gkasten@google.com> Fri Mar 16 10:36:09 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 16 10:36:09 2012 -0700
tree 0adcf0d157b484a3543e0aade9926839342a2ba6
parent ab9ef43721796d6ee4b35ab4614be0210a189fe4
parent cc5370a06eda1a595704c1a3f1daa53fdde45f18

Merge "Add libmedia_native"

test/CameraHal/camera_test_menu.cpp

diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 1430ea4..eb78f0f 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);
+    camera = Camera::connect(camera_index, false, false);
 
     if ( NULL == camera.get() ) {
         printf("Unable to connect to CameraService\n");
         printf("Retrying... \n");
         sleep(1);
-        camera = Camera::connect(camera_index);
+        camera = Camera::connect(camera_index, false, false);
 
         if ( NULL == camera.get() ) {
             printf("Giving up!! \n");
@@ -1456,10 +1456,10 @@
                 stopRecording();
                 closeRecorder();
 
-                camera = Camera::connect(camera_index);
+                camera = Camera::connect(camera_index, false, false);
                   if ( NULL == camera.get() ) {
                       sleep(1);
-                      camera = Camera::connect(camera_index);
+                      camera = Camera::connect(camera_index, false, false);
                       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 afd88be..d8c2fb1 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);
+                    camera = Camera::connect(camera_index, false, false);
                       if ( NULL == camera.get() ) {
                           sleep(1);
-                          camera = Camera::connect(camera_index);
+                          camera = Camera::connect(camera_index, false, false);
 
                           if ( NULL == camera.get() ) {
                               return -1;