From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Thu, 21 Feb 2019 02:44:49 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_line_coverage
X-Git-Tag: accepted/tizen/5.5/unified/20191031.030917^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ff979bdfe58498af6687b54a4774e10e98489d4;p=platform%2Fcore%2Fapi%2Frecorder.git

Merge branch 'tizen' into tizen_line_coverage

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

3ff979bdfe58498af6687b54a4774e10e98489d4
diff --cc src/recorder.c
index a575ec5,cc1357b..cc5ea19
--- a/src/recorder.c
+++ b/src/recorder.c
@@@ -342,11 -354,14 +354,15 @@@ static void _recorder_client_user_callb
  				muse_core_msg_free(send_msg);
  				send_msg = NULL;
  			} else {
- 				LOGE("failed to create send msg for key %d", tbm_key);
+ 				LOGE("failed to create send msg for fd %d", tfd);
  			}
+ 
+ 			/* close imported fd */
+ 			close(tfd);
+ 			tfd = -1;
  			break;
  		}
 +//LCOV_EXCL_START
  	case MUSE_RECORDER_EVENT_TYPE_ERROR:
  		{
  			int error = 0;
@@@ -931,15 -940,11 +942,12 @@@ static void *_recorder_msg_recv_func(gp
  	recv_msg = cb_info->recv_msg;
  
  	while (g_atomic_int_get(&cb_info->msg_recv_running)) {
- 		recv_length = muse_core_msg_recv(cb_info->fd, recv_msg, MUSE_MSG_MAX_LENGTH);
+ 		/* tfd[0] is only used. */
+ 		tfd[0] = -1;
+ 
+ 		recv_length = muse_core_msg_recv_fd(cb_info->fd, recv_msg, MUSE_MSG_MAX_LENGTH, tfd);
  		if (recv_length <= 0) {
 +//LCOV_EXCL_START
  			cb_info->is_server_connected = FALSE;
  			LOGE("receive msg failed - server disconnected");
  			break;
@@@ -1511,12 -1431,17 +1441,18 @@@ static int _recorder_create_common(reco
  		LOGE("muse_client_new failed - returned fd %d", sock_fd);
  		ret = RECORDER_ERROR_INVALID_OPERATION;
  		goto _ERR_RECORDER_EXIT;
 +//LCOV_EXCL_STOP
  	}
  
+ 	if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
+ 		LOGE("muse client get module index failed");
+ 		ret = RECORDER_ERROR_INVALID_OPERATION;
+ 		goto _ERR_RECORDER_EXIT;
+ 	}
+ 
  	if (type == MUSE_RECORDER_TYPE_AUDIO) {
  		send_msg = muse_core_msg_new(MUSE_RECORDER_API_CREATE,
- 			MUSE_TYPE_INT, "module", MUSE_RECORDER,
+ 			MUSE_TYPE_INT, "module", module_index,
  			MUSE_TYPE_INT, PARAM_RECORDER_TYPE, MUSE_RECORDER_TYPE_AUDIO,
  			MUSE_TYPE_INT, "pid", getpid(),
  			NULL);
@@@ -3475,11 -3385,16 +3412,17 @@@ int recorder_get_device_state(recorder_
  		LOGE("muse_client_new failed - returned fd %d", sock_fd);
  		ret = RECORDER_ERROR_INVALID_OPERATION;
  		goto _GET_DEVICE_STATE_EXIT;
 +//LCOV_EXCL_STOP
  	}
  
+ 	if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
+ 		LOGE("muse client get module index failed");
+ 		ret = RECORDER_ERROR_INVALID_OPERATION;
+ 		goto _GET_DEVICE_STATE_EXIT;
+ 	}
+ 
  	send_msg = muse_core_msg_new(MUSE_RECORDER_API_GET_DEVICE_STATE,
- 		MUSE_TYPE_INT, "module", MUSE_RECORDER,
+ 		MUSE_TYPE_INT, "module", module_index,
  		MUSE_TYPE_INT, PARAM_RECORDER_TYPE, type,
  		NULL);
  	if (!send_msg) {