Merge branch 'tizen' into tizen_line_coverage

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

diff --cc src/recorder.c
index 406c198,38f833f..b5c54f0
--- 1/src/recorder.c
--- 2/src/recorder.c
+++ b/src/recorder.c
@@@ -1610,9 -1617,9 +1640,9 @@@ static int _recorder_create_common(reco
        LOGD("done");
  
        return RECORDER_ERROR_NONE;
 -
 +//LCOV_EXCL_START
  _ERR_RECORDER_AFTER_CREATE:
-       _recorder_msg_send(MUSE_RECORDER_API_DESTROY, pc->cb_info, &destroy_ret);
+       _recorder_msg_send(MUSE_RECORDER_API_DESTROY, pc->cb_info, &destroy_ret, RECORDER_CB_TIMEOUT);
        LOGE("destroy return 0x%x", destroy_ret);
  
  _ERR_RECORDER_EXIT:
@@@ -1768,10 -1773,9 +1798,10 @@@ int recorder_unprepare(recorder_h recor
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
 +//LCOV_EXCL_STOP
        }
  
-       _recorder_msg_send(api, pc->cb_info, &ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
  
        LOGD("ret : 0x%x", ret);
  
@@@ -1808,10 -1811,9 +1838,10 @@@ int recorder_start(recorder_h recorder
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
 +//LCOV_EXCL_STOP
        }
  
-       _recorder_msg_send(api, pc->cb_info, &ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_NO_TIMEOUT);
  
        if (pc->camera && current_state == RECORDER_STATE_READY)
                camera_start_evas_rendering(pc->camera);
@@@ -1872,10 -1873,9 +1902,10 @@@ int recorder_commit(recorder_h recorder
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
 +//LCOV_EXCL_STOP
        }
  
-       _recorder_msg_send(api, pc->cb_info, &ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
  
        if (pc->camera && current_state >= RECORDER_STATE_RECORDING)
                camera_start_evas_rendering(pc->camera);