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

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-event-sender.c

diff --git a/bt-service/bt-service-event-sender.c b/bt-service/bt-service-event-sender.c
index f75731b..4dc4691 100644 (file)
--- a/bt-service/bt-service-event-sender.c
+++ b/bt-service/bt-service-event-sender.c
@@ -200,6 +200,7 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                break;
        case BLUETOOTH_EVENT_SUPPORTED_PROFILE_TRUSTED:
                signal = BT_SUPPORTED_PROFILE_TRUSTED;
+               break;
        case BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY:
                signal = BT_KBD_PASSKEY_DISPLAY_REQ_RECEIVED;
                break;
@@ -217,27 +218,27 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                break;
        case BLUETOOTH_HID_CONNECTED:
                signal = BT_INPUT_CONNECTED;
-               BT_INFO_C("Connected [HID]");
+               BT_INFO_C("### Connected [HID]");
                break;
        case BLUETOOTH_HID_DISCONNECTED:
                signal = BT_INPUT_DISCONNECTED;
-               BT_INFO_C("Disconnected [HID]");
+               BT_INFO_C("### Disconnected [HID]");
                break;
        case BLUETOOTH_HID_DEVICE_CONNECTED:
                signal = BT_INPUT_HID_DEVICE_CONNECTED;
-               BT_INFO_C("Connected [HIDDevice]");
+               BT_INFO_C("### Connected [HID Device]");
                break;
        case BLUETOOTH_HID_DEVICE_DISCONNECTED:
                signal = BT_INPUT_HID_DEVICE_DISCONNECTED;
-               BT_INFO_C("Disconnected [HIDDevice]");
+               BT_INFO_C("### Disconnected [HID Device]");
                break;
        case BLUETOOTH_PBAP_CONNECTED:
                signal = BT_PBAP_CONNECTED;
-               BT_INFO_C("Connected [PBAP Client]");
+               BT_INFO_C("### Connected [PBAP Client]");
                break;
        case BLUETOOTH_PBAP_DISCONNECTED:
                signal = BT_PBAP_DISCONNECTED;
-               BT_INFO_C("Disconnected [PBAP Client]");
+               BT_INFO_C("### Disconnected [PBAP Client]");
                break;
        case BLUETOOTH_PBAP_PHONEBOOK_SIZE:
                signal = BT_PBAP_PHONEBOOK_SIZE;
@@ -264,19 +265,19 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                break;
        case BLUETOOTH_EVENT_AV_CONNECTED:
                signal = BT_STEREO_HEADSET_CONNECTED;
-               BT_INFO_C("Connected [A2DP]");
+               BT_INFO_C("### Connected [A2DP]");
                break;
        case BLUETOOTH_EVENT_AV_DISCONNECTED:
                signal = BT_STEREO_HEADSET_DISCONNECTED;
-               BT_INFO_C("Disconnected [A2DP]");
+               BT_INFO_C("### Disconnected [A2DP]");
                break;
        case BLUETOOTH_EVENT_AV_SOURCE_CONNECTED:
                signal = BT_A2DP_SOURCE_CONNECTED;
-               BT_INFO_C("Connected [A2DP Source]");
+               BT_INFO_C("### Connected [A2DP Source]");
                break;
        case BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED:
                signal = BT_A2DP_SOURCE_DISCONNECTED;
-               BT_INFO_C("Disconnected [A2DP Source]");
+               BT_INFO_C("### Disconnected [A2DP Source]");
                break;
        case BLUETOOTH_EVENT_AG_AUDIO_CONNECTED:
                signal = BT_SCO_CONNECTED;
@@ -404,6 +405,7 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                break;
        case BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED:
                signal = BT_GATT_REQ_ATT_MTU_CHANGED;
+               break;
        case BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED:
                signal = BT_IPSP_INITIALIZED;
                break;
@@ -419,6 +421,12 @@ int _bt_send_event(int event_type, int event, GVariant *param)
        case BLUETOOTH_EVENT_LE_DATA_LENGTH_CHANGED:
                signal = BT_LE_DATA_LENGTH_CHANGED;
                break;
+       case BLUETOOTH_EVENT_REMOTE_IBEACON_DEVICE_FOUND:
+               signal = BT_IBEACON_DEVICE_FOUND;
+               break;
+       case BLUETOOTH_EVENT_PXP_PROPERTY_CHANGED:
+               signal = BT_PXP_PROPERTY_CHANGED;
+               break;
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
@@ -429,9 +437,8 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 
        msg1 = g_dbus_message_new_signal(path, BT_EVENT_SERVICE, signal);
        g_dbus_message_set_body(msg1, param);
-       if (!g_dbus_connection_send_message(event_conn, msg1, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 0, NULL)) {
+       if (!g_dbus_connection_send_message(event_conn, msg1, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 0, NULL))
                BT_ERR("Error while sending");
-       }
 
        g_object_unref(msg1);
 
@@ -545,7 +552,6 @@ int _bt_init_service_event_sender(void)
        }
 
        conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-       retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
        if (conn == NULL) {
                BT_ERR("conn == NULL");
                if (err) {
@@ -580,7 +586,6 @@ int _bt_init_hf_local_term_event_sender(void)
        }
 
        conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-       retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
        if (conn == NULL) {
                BT_ERR("conn == NULL");
                if (err) {
@@ -627,4 +632,3 @@ int _bt_send_dump_signal(char *signal)
 
        return BLUETOOTH_ERROR_NONE;
 }
-