QCamera2: stack: Increase camera open retry count
If camera daemon crashes, it could take up to 10 seconds for it
to restarts. This time seems to increase in latest OS upgrade.
Increasing the retry count makes it less likely to fail get_camera_info.
Test: Hardcode hasPendingBuffers in HAL destructor to force restart
Bug: 67576800
Change-Id: Ifd697e7fed4944a255e1efea3b96c75345b253c1
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;
