From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Mon, 8 Jul 2019 05:48:27 +0000 (+0900)
Subject: Merge branch 'tizen_line_coverage' into tizen
X-Git-Tag: submit/tizen/20190709.022805~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88241751784f3277c5060d8fe0d713f643ed67cd;p=platform%2Fcore%2Fapi%2Fsound-manager.git

Merge branch 'tizen_line_coverage' into tizen

Change-Id: I44835edc52e068b08c5d126cf52bba481eff09f1
---

88241751784f3277c5060d8fe0d713f643ed67cd
diff --cc src/sound_manager_private.c
index c6350bb,7c65474..30f2294
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@@ -896,11 -889,12 +902,13 @@@ int _get_stream_conf_info(const char *s
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for GET_STREAM_INFO error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		ret = MM_ERROR_SOUND_INTERNAL;
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  
  	/* get priority */
@@@ -1053,11 -1047,12 +1061,13 @@@ int _set_manual_route_info(unsigned in
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for SET_STREAM_ROUTE_DEVICES error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		ret = MM_ERROR_SOUND_INTERNAL;
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  
  	g_variant_get(result, "(&s)", &dbus_ret);
@@@ -1153,11 -1149,12 +1165,13 @@@ int _get_volume_max_level(const char *d
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for GET_VOLUME_MAX_LEVEL error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		ret = MM_ERROR_SOUND_INTERNAL;
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  
  	g_variant_get(result, "(u&s)", max_level, &dbus_ret);
@@@ -1298,11 -1295,12 +1314,13 @@@ int _get_current_volume_type(const cha
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for GET_CURRENT_VOLUME_TYPE error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		ret = MM_ERROR_SOUND_INTERNAL;
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  
  	g_variant_get(result, "(&s&s)", &dbus_volume_type, &dbus_ret);
@@@ -1350,11 -1348,12 +1368,13 @@@ int _get_current_media_routing_path(con
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for GET_CURRENT_MEDIA_ROUTING_PATH error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		ret = MM_ERROR_SOUND_INTERNAL;
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  
  	g_variant_get(result, "(&s&s)", &dbus_device_type, &dbus_ret);
@@@ -1399,10 -1398,11 +1419,12 @@@ void _update_focus_status(unsigned int 
  							NULL,
  							&err);
  	if (!result || err) {
+ 		//LCOV_EXCL_START
  		LOGE("g_dbus_connection_call_sync() for UPDATE_FOCUS_STATUS error (%s)", err ? err->message : NULL);
 -		g_error_free(err);
 +		if (err)
 +			g_error_free(err);
  		goto LEAVE;
+ 		//LCOV_EXCL_STOP
  	}
  	g_variant_get(result, "(&s)", &dbus_ret);
  	LOGI("g_dbus_connection_call_sync() success, method return value is (%s)", dbus_ret);
@@@ -2642,40 -2637,4 +2666,41 @@@ int _set_virtual_stream_volume(virtual_
  
  	return ret;
  }
 +
 +int _set_acm_master_mode(bool on)
 +{
 +	int ret = MM_ERROR_NONE;
 +	GVariant *result = NULL;
 +	GDBusConnection *conn = NULL;
 +	GError *err = NULL;
 +
 +	if ((ret = __get_dbus_connection(&conn)))
 +		return ret;
 +
 +	result = g_dbus_connection_call_sync(conn,
 +									  PA_BUS_NAME,
 +									  PA_DEVICE_MANAGER_OBJECT_PATH,
 +									  PA_DEVICE_MANAGER_INTERFACE,
 +									  PA_DEVICE_MANAGER_METHOD_NAME_SET_ACM_MODE,
 +									  g_variant_new("(u)", (unsigned int)on),
 +									  NULL,
 +									  G_DBUS_CALL_FLAGS_NONE,
 +									  2000,
 +									  NULL,
 +									  &err);
 +	if (err) {
 +		LOGE("g_dbus_connection_call_sync() for SET ACM MODE error (%s)", err->message);
 +		ret = _convert_dbus_error(err->message);
 +		g_error_free(err);
 +		goto LEAVE;
 +	} else {
 +		LOGI("ACM master mode [%s]", on ? "ON" : "OFF");
 +	}
 +
 +LEAVE:
 +	g_variant_unref(result);
 +	g_object_unref(conn);
 +
 +	return ret;
 +}
+ //LCOV_EXCL_STOP