commit fd231dd8699e20e8d1560dfd12fafd9242436cbd
author Ranjith Kagathi Ananda <ranjith@codeaurora.org> Mon Dec 12 16:11:33 2016 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Fri Jan 20 17:35:18 2017 -0800
tree 5b941e5b56d037b7bb649bc74966fe6b303a6483
parent e763e80a8b01c0f494b9eb36e5f68925af2ba104

QCamera2:HAL: Removing 20 second redundancy.

With cameraserver and mm-qcamera-daemon merged as one
process there is no need to synchronize sensor probe.

Ack-by:  Mridul Singh

BUG=34393761
CRs-Fixed: 1098728
Change-Id: I8f3e858b3bb554efaaa98f7ae7fbf1a98e9bb928

QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c

diff --git a/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c b/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
index 291a495..d2b6b99 100644
--- a/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
+++ b/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
@@ -1782,9 +1782,11 @@
     int num_media_devices = 0;
     int8_t num_cameras = 0;
     char subdev_name[32];
+    char prop[PROPERTY_VALUE_MAX];
+#ifdef DAEMON_PRESENT
     int32_t sd_fd = -1;
     struct sensor_init_cfg_data cfg;
-    char prop[PROPERTY_VALUE_MAX];
+#endif
 
     LOGD("E");
 
@@ -1851,6 +1853,7 @@
         dev_fd = -1;
     }
 
+#ifdef DAEMON_PRESENT
     /* Open sensor_init subdev */
     sd_fd = open(subdev_name, O_RDWR);
     if (sd_fd < 0) {
@@ -1864,7 +1867,7 @@
         LOGE("failed");
     }
     close(sd_fd);
-    dev_fd = -1;
+#endif
 
 
     num_media_devices = 0;