Merge branch 'tizen' into tizen_line_coverage

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

diff --cc src/camera.c
index 1fb69a9,d2881e7..1c3ffac
--- 1/src/camera.c
--- 2/src/camera.c
+++ b/src/camera.c
@@@ -3017,9 -2955,21 +2976,22 @@@ int camera_set_display(camera_h camera
        if (type == CAMERA_DISPLAY_TYPE_NONE) {
                LOGD("display type NONE");
        } else {
+               /* display interface handle */
+               if (!cb_info->dp_interface) {
+                       if (mm_display_interface_init(&cb_info->dp_interface) != MM_ERROR_NONE) {
+                               LOGE("display interface init failed");
+                               return CAMERA_ERROR_NOT_SUPPORTED;
+                       }
+               }
+ 
                ret = mm_display_interface_set_display(cb_info->dp_interface, type, display, &cb_info->parent_id);
-               if (ret == MM_ERROR_NONE && type == CAMERA_DISPLAY_TYPE_EVAS) {
+               if (ret != MM_ERROR_NONE) {
+                       LOGE("[INVALID_OPERATION] set display failed[0x%x]", ret);
+                       return CAMERA_ERROR_INVALID_OPERATION;
+               }
+ 
+               if (type == CAMERA_DISPLAY_TYPE_EVAS) {
 +//LCOV_EXCL_START
                        camera_flip_e flip = CAMERA_FLIP_NONE;
                        camera_display_mode_e mode = CAMERA_DISPLAY_MODE_LETTER_BOX;
                        camera_rotation_e rotation = CAMERA_ROTATION_NONE;