Remove redundant debug message
[platform/core/connectivity/bluetooth-frwk.git] / bt-service-adaptation / services / bt-request-handler.c
index 42ed3dd..cdd32e6 100644 (file)
@@ -222,6 +222,7 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_GATT_SERVER_DELETE_SERVICE
                        || service_function == BT_START_LE_DISCOVERY
                        || service_function == BT_STOP_LE_DISCOVERY
+                       || service_function == BT_GET_CONNECTABLE
 #ifdef TIZEN_GATT_CLIENT
                        || service_function == BT_GATT_CLIENT_REGISTER
                        || service_function == BT_GATT_GET_PRIMARY_SERVICES
@@ -598,6 +599,17 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &is_connectable, sizeof(gboolean));
                break;
        }
+       case BT_GET_CONNECTABLE: {
+               result  = _bt_get_connectable();
+
+               /* Save invocation */
+               if (result == BLUETOOTH_ERROR_NONE) {
+                        sender = (char*)g_dbus_method_invocation_get_sender(context);
+                        _bt_save_invocation_context(context, result, sender,
+                                        function_name, NULL);
+               }
+               break;
+       }
        case BT_SET_CONNECTABLE: {
                gboolean is_connectable;
 
@@ -2020,16 +2032,9 @@ int __bt_bluez_request(int function_name,
        }
        case BT_LE_OOB_READ_LOCAL_DATA: {
                bt_oob_data_t local_oob_data;
-               bt_oob_data_t *local_oob_cache_data;
 
-               local_oob_cache_data = _bt_le_oob_get_local_cache_data();
-               if (local_oob_cache_data && local_oob_cache_data->eir_len) {
-                       g_array_append_vals(*out_param1, local_oob_cache_data,
-                               sizeof(bt_oob_data_t));
-                       return BLUETOOTH_ERROR_NONE;
-               }
+               memset(&local_oob_data, 0x00, sizeof(bt_oob_data_t));
                result = _bt_le_oob_read_local_data(&local_oob_data);
-               _bt_le_oob_set_local_cache_data(&local_oob_data);
 
                g_array_append_vals(*out_param1, &local_oob_data,
                                sizeof(bt_oob_data_t));
@@ -2692,8 +2697,6 @@ int __bt_bluez_request(int function_name,
                int mtu = -1;
                bluetooth_gatt_client_char_prop_info_t param;
 
-               BT_INFO("GATT Client ACQUIRE WRITE recived");
-
                sender = (char*)g_dbus_method_invocation_get_sender(context);
 
                __bt_service_get_parameters(in_param1, &param,
@@ -2705,9 +2708,9 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &mtu, sizeof(int));
 
                if (BLUETOOTH_ERROR_NONE == result)
-                       BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
+                       BT_DBG("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
                else {
-                       BT_ERR("Gatt Client Acqure Write");
+                       BT_ERR("GATT Client: gatt acquire write failed");
                        break;
                }
 
@@ -2756,7 +2759,7 @@ int __bt_bluez_request(int function_name,
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
                } else {
-                       BT_INFO("GATT Client: gatt connect failed");
+                       BT_ERR("GATT Client: gatt connect failed");
                        g_array_append_vals(*out_param1, &address,
                                        sizeof(bluetooth_device_address_t));
                }
@@ -3079,6 +3082,7 @@ normal:
        }
        case BT_SET_SCAN_PARAMETERS: {
                bluetooth_le_scan_params_t scan_params;
+
                __bt_service_get_parameters(in_param1, &scan_params,
                                sizeof(bluetooth_le_scan_params_t));
 
@@ -4153,6 +4157,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_IS_DISCOVERYING:
        case BT_IS_LE_DISCOVERYING:
        case BT_IS_CONNECTABLE:
+       case BT_GET_CONNECTABLE:
        case BT_GET_BONDED_DEVICES:
        case BT_GET_PROFILE_CONNECTED_DEVICES:
        case BT_GET_BONDED_DEVICE:
@@ -4420,24 +4425,22 @@ void _bt_service_method_return(GDBusMethodInvocation *invocation,
                GArray *out_param, int result)
 {
        GVariant *out_var;
-       BT_DBG("+");
+       BT_DBG("");
        out_var = g_variant_new_from_data((const GVariantType *)"ay",
                        out_param->data, out_param->len, TRUE, NULL, NULL);
 
        g_dbus_method_invocation_return_value(invocation,
                        g_variant_new("(iv)", result, out_var));
-       BT_DBG("-");
 }
 
 void _bt_service_method_return_with_unix_fd_list(GDBusMethodInvocation *invocation,
                GArray *out_param, int result, GUnixFDList *fd_list)
 {
        GVariant *out_var;
-       BT_DBG("+");
+       BT_DBG("");
        out_var = g_variant_new_from_data((const GVariantType *)"ay",
                        out_param->data, out_param->len, TRUE, NULL, NULL);
 
        g_dbus_method_invocation_return_value_with_unix_fd_list(invocation,
                        g_variant_new("(iv)", result, out_var), fd_list);
-       BT_DBG("-");
 }