Fix BT enable issue on XU3 TV profile

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index a9b24c9..3342aed 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -1029,8 +1029,9 @@ void __bt_device_event_filter(GDBusConnection *connection,
                unsigned char addr_type;
                bt_connection_info_t conn_info;
                bluetooth_device_address_t dev_address = { {0} };
+               int rssi;
                BT_DBG("BT_DEVICE_DISCONNECTED");
-               g_variant_get(parameters, "(i&sy)", &result, &address, &addr_type);
+               g_variant_get(parameters, "(i&syi)", &result, &address, &addr_type, &rssi);
 
                _bt_convert_addr_string_to_type(dev_address.addr,
                                                address);
@@ -1043,6 +1044,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
 
                conn_info.addr_type = addr_type;
                conn_info.disc_reason = result;
+               conn_info.rssi = rssi;
                BT_DBG("Sending Event to Framework, disconnect reason [0x%x]", result);
                _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_DISCONNECTED,
                                result, &conn_info,
@@ -3569,8 +3571,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                GVariant *parameters,
                gpointer user_data)
 {
-       BT_DBG("GATT Client event handler Entry >>");
-
        bt_event_info_t *event_info;
        int result = BLUETOOTH_ERROR_NONE;
 
@@ -3579,7 +3579,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
 
        if (strcasecmp(signal_name, BT_GATT_CHAR_VAL_CHANGED) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED */
-               BT_INFO("GATT Client event[BT_GATT_CHAR_VAL_CHANGED]");
+               BT_DBG("GATT Client event[BT_GATT_CHAR_VAL_CHANGED]");
                bt_gatt_char_property_t char_prop;
                const char *address = NULL;
                GVariant *data_var = NULL;
@@ -3588,7 +3588,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                GVariant *char_uuid_var = NULL;
                int svc_uuid_len = 0;
                int char_uuid_len = 0;
-               unsigned int i;
 
                memset(&char_prop, 0x00, sizeof(bt_gatt_char_property_t));
 
@@ -3621,15 +3620,15 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                char_prop.svc_prop.instance_id = svc_inst;
 
                /* DEBUG */
-               for (i = 0; i < char_prop.val_len; i++)
-                       BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
+       //      for (i = 0; i < char_prop.val_len; i++)
+       //              BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
 
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED,
                                result, &char_prop,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_CHAR */
-               BT_INFO("GATT Client event[BT_GATT_CLIENT_READ_CHAR]");
+               BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_CHAR]");
                bt_gatt_char_property_t char_prop;
                const char *address = NULL;
                GVariant *data_var = NULL;
@@ -3638,7 +3637,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                GVariant *char_uuid_var = NULL;
                int svc_uuid_len = 0;
                int char_uuid_len = 0;
-               unsigned int i;
 
                memset(&char_prop, 0x00, sizeof(bt_gatt_char_property_t));
 
@@ -3656,11 +3654,10 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                                &data_var);
                g_strlcpy(char_prop.address, address, BT_ADDRESS_STRING_SIZE);
 
-               BT_INFO("GATT Client Read Callback from [%s] svc inst [%d] char val len [%d] char inst [%d]",
+               BT_DBG("GATT Client Read Callback from [%s] svc inst [%d] char val len [%d] char inst [%d]",
                                address, svc_inst, char_prop.val_len, char_prop.prop.instance_id);
 
                if (char_prop.val_len > 0) {
-                       BT_INFO("Get the read data");
                        /* Copy Data */
                        memcpy(&char_prop.value, g_variant_get_data(data_var), char_prop.val_len);
                }
@@ -3672,15 +3669,15 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                char_prop.svc_prop.instance_id = svc_inst;
 
                /* DEBUG */
-               for (i = 0; i < char_prop.val_len; i++)
-                       BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
+       //      for (i = 0; i < char_prop.val_len; i++)
+       //              BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
 
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
                                result, &char_prop,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_CHAR */
-               BT_INFO("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]");
+               BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]");
                bt_gatt_char_property_t char_prop;
                const char *address = NULL;
                GVariant *svc_uuid_var = NULL;
@@ -3718,7 +3715,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_DESC */
-               BT_INFO("GATT Client event[BT_GATT_CLIENT_READ_DESC]");
+               BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_DESC]");
                bt_gatt_char_descriptor_property_t desc_prop;
                const char *address = NULL;
                GVariant *data_var = NULL;
@@ -3779,7 +3776,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_DESC */
-               BT_INFO("GATT Client event[BT_GATT_CLIENT_WRITE_DESC]");
+               BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_DESC]");
                bt_gatt_char_descriptor_property_t desc_prop;
                const char *address = NULL;
                GVariant *svc_uuid_var = NULL;
@@ -3826,9 +3823,28 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_DESC,
                                result, &desc_prop,
                                event_info->cb, event_info->user_data);
-       }
+       } else if (strcasecmp(signal_name, BT_GATT_CLIENT_SERVICE_CHANGED) == 0) {
+               BT_DBG("GATT Client event[BT_GATT_CLIENT_SERVICE_CHANGED]");
+               bt_gatt_service_change_t change = {0, };
+               char *address_str = NULL;
+               char *name = NULL;
+
+               g_variant_get(parameters, "(i&s&s)", &change.change_type, &address_str, &change.uuid);
 
-       BT_DBG("GATT Client event handler Exit <<");
+               _bt_convert_addr_string_to_type(change.device_addr.addr, address_str);
+               bluetooth_get_uuid_name(change.uuid, &name);
+               BT_INFO(" ### GATT Service %s [%s]", change.change_type ? "Added" : "Removed", name);
+               g_free(name);
+
+               if (_bluetooth_gatt_check_service_change_watcher_address(&change.device_addr) == FALSE) {
+                       BT_INFO("No watcher for %s", address_str);
+                       return;
+               }
+
+               _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_SERVICE_CHANGED,
+                               BLUETOOTH_ERROR_NONE, &change,
+                               event_info->cb, event_info->user_data);
+       }
 }
 
 #endif