| commit | 7b3c2f5bfdd6fbc01dd2d0c35351bc542e40bcf8 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 13 07:26:48 2017 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 13 07:26:48 2017 +0000 |
| tree | 39cf0115710d8568740fdc203d78584cdab44f16 | |
| parent | 266bff936c00878c31705f19f2d17d1c776191d2 [diff] | |
| parent | 28515ec9dc169e1ebbcc9eafdd4e8041c96ac36c [diff] |
Snap for 4393674 from 28515ec9dc169e1ebbcc9eafdd4e8041c96ac36c to oc-mr1-release Change-Id: I152e984b5f8440ffd74d671090847b6b561834bf
diff --git a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h index 57154e3..c32e1ce 100644 --- a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h +++ b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
@@ -47,7 +47,7 @@ #define MM_CAMERA_CHANNEL_POLL_THREAD_MAX 1 #define MM_CAMERA_DEV_NAME_LEN 32 -#define MM_CAMERA_DEV_OPEN_TRIES 30 +#define MM_CAMERA_DEV_OPEN_TRIES 300 #define MM_CAMERA_DEV_OPEN_RETRY_SLEEP 20 #define THREAD_NAME_SIZE 15
diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c index 9e6f30f..df2d93c 100644 --- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c +++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -250,7 +250,7 @@ { char dev_name[MM_CAMERA_DEV_NAME_LEN]; int32_t rc = 0; - int8_t n_try=MM_CAMERA_DEV_OPEN_TRIES; + int32_t n_try=MM_CAMERA_DEV_OPEN_TRIES; uint8_t sleep_msec=MM_CAMERA_DEV_OPEN_RETRY_SLEEP; int cam_idx = 0; const char *dev_name_value = NULL;