Calls sd_notify(STOPPING=1) to ensure systemd's operation

[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 b2360fa..a9b24c9 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -457,6 +457,12 @@ void __bt_adapter_event_filter(GDBusConnection *connection,
                }
 
                dbus_data = g_array_new(TRUE, TRUE, sizeof(gchar));
+
+               if (dbus_data == NULL) {
+                       BT_ERR("g_array_new failed");
+                       g_variant_unref(param);
+                       return;
+               }
                __bt_fill_garray_from_variant(param, dbus_data);
                g_variant_unref(param);
 
@@ -491,7 +497,7 @@ void __bt_adapter_event_filter(GDBusConnection *connection,
                        BT_INFO("App-wise data transaction details:");
                        for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
                                bt_battery_app_data *t = (bt_battery_app_data *)(l->data);
-                               BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+                               BT_DBG("%ld %ld %d %d %u", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes, t->time);
                        }
                }
 
@@ -500,6 +506,7 @@ void __bt_adapter_event_filter(GDBusConnection *connection,
                                event_info->cb, event_info->user_data);
                g_slist_free(data->atm_list);
                g_free(data);
+               g_array_free(dbus_data, TRUE);
        } else if (strcasecmp(signal_name, BT_DISCOVERABLE_MODE_CHANGED) == 0) {
                int mode = 0;
 
@@ -812,6 +819,7 @@ void __bt_adapter_le_event_filter(GDBusConnection *connection,
                                BLUETOOTH_ERROR_NONE, NULL,
                                event_info->cb, event_info->user_data);
        } else if (strcasecmp(signal_name, BT_LE_DISCOVERY_FINISHED) == 0) {
+               _bt_set_le_scan_status(FALSE);
                g_variant_get(parameters, "(i)", &result);
                _bt_common_event_cb(BLUETOOTH_EVENT_LE_DISCOVERY_FINISHED,
                                result, NULL,