Merge branch 'tizen' into tizen_line_coverage

Change-Id: I80b1c212d45c248fb886c12f8b2cd545d4f3671f
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --cc src/camera.c
index 56d6593,4e34fd3..3b24630
--- 1/src/camera.c
--- 2/src/camera.c
+++ b/src/camera.c
@@@ -2632,12 -2751,14 +2772,14 @@@ int camera_stop_preview(camera_h camera
                                return ret;
                }
        }
 -
 +//LCOV_EXCL_STOP
        /* send stop preview message */
-       _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
  
-       if (ret != CAMERA_ERROR_NONE &&
-               current_state == CAMERA_STATE_PREVIEW) {
+       if (ret == CAMERA_ERROR_NONE) {
+               if (pc->cb_info->user_buffer_supported)
+                       _camera_release_preview_buffer(camera);
+       } else if (current_state == CAMERA_STATE_PREVIEW) {
                LOGW("restart evas rendering");
                _camera_start_evas_rendering(camera);
        }