diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 07:26:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 07:26:48 +0000 |
| commit | 7b3c2f5bfdd6fbc01dd2d0c35351bc542e40bcf8 (patch) | |
| tree | 39cf0115710d8568740fdc203d78584cdab44f16 | |
| parent | 266bff936c00878c31705f19f2d17d1c776191d2 (diff) | |
| parent | 28515ec9dc169e1ebbcc9eafdd4e8041c96ac36c (diff) | |
| download | angler-oreo-mr1-s1-release.tar.gz | |
Snap for 4393674 from 28515ec9dc169e1ebbcc9eafdd4e8041c96ac36c to oc-mr1-releaseandroid-vts-8.1_r3android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r2android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-m4-s1-release
Change-Id: I152e984b5f8440ffd74d671090847b6b561834bf
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h | 2 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj) { 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; |