Handle the recovery only for wearable 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 9285a83..64c22a5 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -1051,7 +1051,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
                int link_type;
                gboolean rssi_enabled = FALSE;
 
-               g_variant_get(parameters, "(isib)", &result, &address,
+               g_variant_get(parameters, "(i&sib)", &result, &address,
                                        &link_type, &rssi_enabled);
 
                BT_DBG("RSSI Enabled[Address:%s LinkType:%d RSSI_dbm:%d]",
@@ -1070,7 +1070,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
                int link_type;
                bt_rssi_alert_t alert = { 0, };
 
-               g_variant_get(parameters, "(isiii)", &result, &address,
+               g_variant_get(parameters, "(i&siii)", &result, &address,
                                        &link_type, &alert_type, &rssi_dbm);
 
                alert.alert_type = alert_type;
@@ -1088,7 +1088,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
                char *address;
                bt_raw_rssi_t raw_rssi = { 0, };
 
-               g_variant_get(parameters, "(isii)", &result,
+               g_variant_get(parameters, "(i&sii)", &result,
                                        &address, &link_type, &rssi_dbm);
 
                BT_DBG("Address [%s] Link Type[%d] dBm[%d]",
@@ -1235,7 +1235,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
 
                BT_DBG("BT_PXP_PROPERTY_CHANGED");
 
-               g_variant_get(parameters, "(isiii)", &result, &address, &role, &type, &level);
+               g_variant_get(parameters, "(i&siii)", &result, &address, &role, &type, &level);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
                memcpy(&params.device_address, &dev_address, BLUETOOTH_ADDRESS_LENGTH);
@@ -2248,7 +2248,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection,
                        GVariant* value = NULL;
                        while (g_variant_iter_loop(res, "{sv}", &key, &value)) {
                                char* string_value = NULL;
-                               g_variant_get(value, "s", &string_value);
+                               g_variant_get(value, "&s", &string_value);
                                BT_DBG("got folder name: %s", string_value);
                                folders_struct.names[i] = strdup(string_value);
                        }
@@ -3614,8 +3614,8 @@ 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 Char value changed in remote Server [%s]", address);
-               BT_INFO("GATT Client Char Val len: [%d]", char_prop.val_len);
+               BT_DBG("GATT Client Char value changed in remote Server [%s]", address);
+               BT_DBG("GATT Client Char Val len: [%d]", char_prop.val_len);
 
                if (char_prop.val_len > 0) {
                        /* Copy Data */
@@ -3635,7 +3635,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                g_variant_unref(svc_uuid_var);
                g_variant_unref(char_uuid_var);
                g_variant_unref(data_var);
-
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_CHAR */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_CHAR]");
@@ -3685,7 +3684,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                g_variant_unref(svc_uuid_var);
                g_variant_unref(char_uuid_var);
                g_variant_unref(data_var);
-
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_CHAR */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]");
@@ -3727,7 +3725,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
 
                g_variant_unref(svc_uuid_var);
                g_variant_unref(char_uuid_var);
-
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_DESC */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_DESC]");
@@ -3789,7 +3786,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                g_variant_unref(char_uuid_var);
                g_variant_unref(desc_uuid_var);
                g_variant_unref(data_var);
-
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_DESC */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_DESC]");
@@ -3822,8 +3818,8 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
 
                g_strlcpy(desc_prop.address, address, BT_ADDRESS_STRING_SIZE);
 
-               BT_INFO("GATT Client Write Descriptor Callback from [%s]", address);
-               BT_INFO("GATT Client Descriptor Val len: [%d]", desc_prop.val_len);
+               BT_DBG("GATT Client Write Descriptor Callback from [%s]", address);
+               BT_DBG("GATT Client Descriptor Val len: [%d]", desc_prop.val_len);
 
                /* Copy Data */
                memcpy(&desc_prop.prop.uuid, g_variant_get_data(desc_uuid_var), 16);
@@ -3853,7 +3849,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                _bt_convert_addr_string_to_type(change.device_addr.addr, address_str);
 
                if (_bluetooth_gatt_check_service_change_watcher_address(&change.device_addr) == FALSE) {
-                       BT_INFO("GATT Service changed, but no watcher for %s", address_str);
+                       BT_DBG("GATT Service changed, but no watcher for %s", address_str);
                        return;
                }
 
@@ -3879,7 +3875,7 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                GVariant *parameters,
                gpointer user_data)
 {
-       BT_INFO("GATT Server event handler Entry >>");
+       BT_DBG("Signal : %s", signal_name);
 
        bt_event_info_t *event_info;
        int result = BLUETOOTH_ERROR_NONE;
@@ -3911,7 +3907,6 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
 #endif
-               BT_INFO("GATT Server event[BT_GATT_SERVER_WRITE_REQUESTED]");
                const char *address = NULL;
                GVariant *data_var = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -4062,8 +4057,6 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                                event_info->cb, event_info->user_data);
        }
 
-
-       BT_INFO("GATT Server event handler Exit <<");
 }
 #endif