Not enable BT on booting time in factory mode

[platform/core/connectivity/bluetooth-frwk.git] / bt-service-adaptation / services / obex / bt-service-obex-event-receiver.c

diff --git a/bt-service-adaptation/services/obex/bt-service-obex-event-receiver.c b/bt-service-adaptation/services/obex/bt-service-obex-event-receiver.c
index d91c48c..7e897c1 100644 (file)
--- a/bt-service-adaptation/services/obex/bt-service-obex-event-receiver.c
+++ b/bt-service-adaptation/services/obex/bt-service-obex-event-receiver.c
@@ -104,10 +104,17 @@ void _bt_convert_addr_string_to_secure_string(char *addr,
        len = strlen(address);
        ret_if(len != BT_ADDRESS_STRING_SIZE - 1);
 
-       g_strlcpy(addr, address, BT_ADDRESS_STRING_SIZE);
-
-       addr[len-1] = 'X';
-       addr[len-2] = 'X';
+       strncpy(addr, address, len);
+       addr[len] = '\0';
+
+       addr[len-7] = 'X';
+       addr[len-8] = 'X';
+       addr[len-10] = 'X';
+       addr[len-11] = 'X';
+       addr[len-13] = 'X';
+       addr[len-14] = 'X';
+       addr[len-16] = 'X';
+       addr[len-17] = 'X';
 
        return;
 }
@@ -429,16 +436,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
 
                _bt_convert_device_path_to_address(path, address);
 
-               /* 0x00 BDADDR_BRDER
-                     0x01 BDADDR_LE_PUBLIC
-                     0x02 BDADDR_LE_RANDOM */
-               _bt_convert_addr_string_to_secure_string(secure_address, address);
-               BT_INFO("Address : %s Type : %d", secure_address, addr_type);
-               BT_ERR_C("### Disconnected [%s] [%d : %s] [%s]", !addr_type ? "BREDR" : "LE",
-                               disc_reason, _bt_convert_disc_reason_to_string(disc_reason),
-                               !addr_type ? dev_name : secure_address);
-               g_free(dev_name);
-
                if (!addr_type) {
                        /*Check for any OPP transfer on the device and cancel
                         * the transfer
@@ -450,6 +447,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        /* TODO: MAP? see above */
                }
                g_free(address);
+               g_free(dev_name);
        } else if (strcasecmp(member, "ProfileStateChanged") == 0) {
                int state = 0;
                char *profile_uuid = NULL;
@@ -463,9 +461,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                _bt_convert_addr_string_to_type(bd_addr.addr, address);
 
                _bt_convert_addr_string_to_secure_string(secure_address, address);
-               BT_DBG("Address: %s", secure_address);
-               BT_DBG("Profile UUID: %s", profile_uuid);
-               BT_DBG("State: %d", state);
+               BT_DBG("[%s] [%s] [%d]", secure_address, profile_uuid, state);
                g_free(address);
        }
 }
@@ -579,7 +575,6 @@ static  void __bt_obexd_event_filter(GDBusConnection *connection,
                        BT_ERR("Fail to get the path");
                        return;
                }
-               BT_INFO("object_path = [%s]", obj_path);
 
                /*Handle OPP_SERVER_CONNECTED_EVENT here */
                /* TODO: MAP? see above */
@@ -601,7 +596,6 @@ static  void __bt_obexd_event_filter(GDBusConnection *connection,
                        BT_ERR("Fail to get the path");
                        return;
                }
-               BT_INFO("object_path = [%s]", obj_path);
 
                if (strncmp(obj_path, BT_SESSION_BASEPATH_CLIENT,
                                strlen(BT_SESSION_BASEPATH_CLIENT)) == 0) {
@@ -1077,29 +1071,22 @@ int _bt_register_map_client_subscribe_signal(GDBusConnection *conn,
 
 int _bt_register_service_event(GDBusConnection *g_conn, int event_type)
 {
-       BT_DBG("+");
-
        retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        switch (event_type) {
        case BT_MANAGER_EVENT:
-               BT_DBG("BT_MANAGER_EVENT: register service event");
                _bt_register_manager_subscribe_signal(g_conn, TRUE);
                break;
        case BT_DEVICE_EVENT:
-               BT_DBG("BT_DEVICE_EVENT: register service event");
                _bt_register_device_subscribe_signal(g_conn, TRUE);
                break;
        case BT_OPP_SERVER_EVENT:
-               BT_DBG("BT_OPP_SERVER_EVENT: register service event");
                _bt_register_opp_server_subscribe_signal(g_conn, TRUE);
                break;
        case BT_OPP_CLIENT_EVENT:
-               BT_DBG("BT_OPP_CLIENT_EVENT: register service event");
                _bt_register_opp_client_subscribe_signal(g_conn, TRUE);
                break;
        case BT_MAP_CLIENT_EVENT:
-               BT_DBG("BT_MAP_CLIENT_EVENT: register service event");
                _bt_register_map_client_subscribe_signal(g_conn, TRUE);
                break;
        default: