commit bf5f6ac9986af8f4a644ef14503c5c1a6c52bc00
author The Android Automerger <android-build@android.com> Mon Mar 19 07:03:50 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Mar 19 07:03:50 2012 -0700
tree 0adcf0d157b484a3543e0aade9926839342a2ba6
parent 15f4f11659750ce36832f55fe6dd7aa145daa6dd
parent b0254272197db0b9cfde6ed42cb83419996aaede

merge in jb-release history after reset to master

test/CameraHal/Android.mk

diff --git a/test/CameraHal/Android.mk b/test/CameraHal/Android.mk
index c7da48a..9a31d85 100644
--- a/test/CameraHal/Android.mk
+++ b/test/CameraHal/Android.mk
@@ -13,6 +13,7 @@
 	libcutils \
 	libbinder \
 	libmedia \
+	libmedia_native \
 	libui \
 	libgui \
 	libcamera_client

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;