Correct the privilege check for BT_UPDATE_LE_CONNECTION_MODE

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-request-sender.c

diff --git a/bt-api/bt-request-sender.c b/bt-api/bt-request-sender.c
index c530c89..e34c1ea 100644 (file)
--- a/bt-api/bt-request-sender.c
+++ b/bt-api/bt-request-sender.c
@@ -29,11 +29,7 @@
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
 #include "bluetooth-media-control.h"
-
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
-#endif
-
 #include "bluetooth-mesh-api.h"
 
 static GSList *sending_requests;
@@ -46,7 +42,7 @@ static GDBusProxy *__bt_gdbus_init_service_proxy(void)
        GDBusProxy *proxy;
        GError *err = NULL;
 
-       service_gconn = _bt_get_system_private_conn();
+       service_gconn = _bt_get_system_common_conn();
 
        if (!service_gconn)
                return NULL;
@@ -231,7 +227,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_device_address_t, 0);
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BT_CONNECT_LE:
                *event_type = BT_DEVICE_EVENT;
                *event = BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED;
@@ -246,23 +241,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_device_address_t, 0);
                break;
-#else
-       case BT_CONNECT_LE:
-               *event_type = BT_DEVICE_EVENT;
-               *event = BLUETOOTH_EVENT_GATT_CONNECTED;
-               ret_if(output == NULL);
-               *param_data = &g_array_index(output,
-                               bluetooth_device_address_t, 0);
-               break;
-       case BT_DISCONNECT_LE:
-               *event_type = BT_DEVICE_EVENT;
-               *event = BLUETOOTH_EVENT_GATT_DISCONNECTED;
-               ret_if(output == NULL);
-               *param_data = &g_array_index(output,
-                               bluetooth_device_address_t, 0);
-               break;
-#endif
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_READ_CHARACTERISTIC:
                BT_INFO("BT_GATT_READ_CHARACTERISTIC");
                *event_type = BT_GATT_CLIENT_EVENT;
@@ -295,7 +273,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_gatt_client_desc_prop_info_t, 0);
                break;
-#endif
        case BT_TDS_READ_TRANSPORT_DATA:
                *event_type = BT_TDS_EVENT;
                *event = BLUETOOTH_EVENT_TDS_TRANSPORT_DATA_RECEIVED;
@@ -373,6 +350,13 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_mesh_model_configure_t, 0);
                break;
+       case BT_MESH_MODEL_EXECUTE_MSG:
+               *event_type = BT_MESH_EVENT;
+               *event = BLUETOOTH_EVENT_MESH_MODEL_MSG_EXECUTED;
+               ret_if(output == NULL);
+               *param_data = &g_array_index(output,
+                               bluetooth_mesh_model_msg_t, 0);
+               break;
        case BT_MESH_MODEL_CONFIG_GROUP_SUB:
                *event_type = BT_MESH_EVENT;
                *event = BLUETOOTH_EVENT_MESH_MODEL_SUBSCRIPTION_CONFGURED;
@@ -578,11 +562,9 @@ static void __send_request_cb(GDBusProxy *proxy,
        } else if (event_type == BT_AVRCP_EVENT) {
                ((bluetooth_cb_func_ptr)cb_data->cb)(bt_event.event,
                                &bt_event, cb_data->user_data);
-#ifdef TIZEN_GATT_CLIENT
        } else if (event_type == BT_GATT_CLIENT_EVENT) {
                ((gatt_client_cb_func_ptr)cb_data->cb)(bt_event.event,
                                (gatt_client_event_param_t*)&bt_event, cb_data->user_data);
-#endif
        } else if (event_type == BT_MESH_EVENT) {
                ((mesh_cb_func_ptr)cb_data->cb)(bt_event.event,
                                (mesh_event_param_t*)&bt_event, cb_data->user_data);