diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-03-22 09:45:43 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-03-22 09:45:43 -0700 |
| commit | 58134d029dce1f2e0d15b0717491697ed693d150 (patch) | |
| tree | e8dfc429796cc6405fcb4c9e340f923163de13eb | |
| parent | 50f28e594dc1ae97a8d63d141994e38af52cd20f (diff) | |
| download | android_hardware_ti_omap4xxx-58134d029dce1f2e0d15b0717491697ed693d150.tar.gz android_hardware_ti_omap4xxx-58134d029dce1f2e0d15b0717491697ed693d150.tar.bz2 android_hardware_ti_omap4xxx-58134d029dce1f2e0d15b0717491697ed693d150.zip | |
Fix native test's calls to camera library
Change-Id: I816bd24669229c3ff3a8397c516080c7d409455f
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 18 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_script.cpp | 9 |
2 files changed, 21 insertions, 6 deletions
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index a315dc3..6ae7eec 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -430,6 +430,8 @@ bool stressTest = false; bool stopScript = false; int restartCount = 0; +static const String16 processName("camera_test"); + /** Calculate delay from a reference time */ unsigned long long timeval_delay(const timeval *ref) { unsigned long long st, end, delay; @@ -1012,13 +1014,17 @@ int stopRecording() { int openCamera() { printf("openCamera(camera_index=%d)\n", camera_index); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, + processName, + Camera::USE_CALLING_UID); 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, + processName, + Camera::USE_CALLING_UID); if ( NULL == camera.get() ) { printf("Giving up!! \n"); @@ -1455,10 +1461,14 @@ int functional_menu() { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, + processName, + Camera::USE_CALLING_UID); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, + processName, + Camera::USE_CALLING_UID); if ( NULL == camera.get() ) { return -1; } diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index afd88be..e850abb 100644 --- a/test/CameraHal/camera_test_script.cpp +++ b/test/CameraHal/camera_test_script.cpp @@ -96,6 +96,7 @@ extern size_t length_fps_ranges; extern size_t length_fpsConst_Ranges; extern size_t length_fpsConst_RangesSec; +static const String16 processName("camera_test"); int execute_functional_script(char *script) { char *cmd, *ctx, *cycle_cmd, *temp_cmd; @@ -237,10 +238,14 @@ int execute_functional_script(char *script) { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, + processName, + Camera::USE_CALLING_UID); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, + processName, + Camera::USE_CALLING_UID); if ( NULL == camera.get() ) { return -1; |