Fix the advertisement fail issue
[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-adapter.c
index 02ac8a3..6a0ccb2 100644 (file)
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
 
+/* Avoid the build error related to vconf.h's dependency */
+#ifndef VCONFKEY_BATTERY_MONITOR_STATUS
+#define VCONFKEY_BATTERY_MONITOR_STATUS "db/bluetooth/bmstatus"
+#endif
+
 static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
 {
        int i;
        guint size;
-       bluetooth_device_info_t info;
+       bluetooth_device_info_t *info;
 
        BT_CHECK_PARAMETER(out_param2, return);
        BT_CHECK_PARAMETER(dev_list, return);
@@ -45,10 +50,10 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
        for (i = 0; i < size; i++) {
                bluetooth_device_info_t *dev_info = NULL;
 
-               info = g_array_index(out_param2,
+               info = &g_array_index(out_param2,
                                bluetooth_device_info_t, i);
 
-               dev_info = g_memdup(&info, sizeof(bluetooth_device_info_t));
+               dev_info = g_memdup(info, sizeof(bluetooth_device_info_t));
 
                if (dev_info)
                        g_ptr_array_add(*dev_list, (gpointer)dev_info);
@@ -64,7 +69,7 @@ BT_EXPORT_API int bluetooth_check_adapter(void)
 #ifndef TIZEN_TEST_EMUL
        int ret;
 
-       ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL);
+       ret = _bt_get_adapter_path(_bt_get_system_private_conn(), NULL);
 
        if (ret != BLUETOOTH_ERROR_NONE)
                return BLUETOOTH_ADAPTER_DISABLED;
@@ -85,11 +90,12 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
        int result;
 
        BT_INFO_C("### Enable adapter");
+       _bt_print_api_caller_name();
        retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED,
                                BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED);
 
 #ifdef TIZEN_FEATURE_BT_DPM
-       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_DPM_RESULT_ACCESS_DENIED,
+       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
                                BLUETOOTH_ERROR_PERMISSION_DEINED);
 #endif
 
@@ -104,11 +110,102 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
        return result;
 }
 
+BT_EXPORT_API int bluetooth_set_battery_monitor_state(bool state)
+{
+       BT_INFO("Setting vconf key");
+       if (vconf_set_bool(VCONFKEY_BATTERY_MONITOR_STATUS, state) != 0)
+       {
+               BT_ERR("vconf_set_bool failed");
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+       return BLUETOOTH_ERROR_NONE;
+}
+
+BT_EXPORT_API int bluetooth_get_battery_monitor_state()
+{
+       int state = 0;
+       BT_INFO("Getting vconf key value");
+       if (vconf_get_bool(VCONFKEY_BATTERY_MONITOR_STATUS, &state) != 0)
+               BT_ERR("vconf_get_bool failed");
+       return state;
+}
+
+BT_EXPORT_API int bluetooth_read_battery_data(bt_battery_data *data)
+{
+       int result;
+       bt_battery_dbus_data_t *info = NULL;
+
+       BT_CHECK_PARAMETER(data, return);
+
+       BT_INFO("### Requesting battery data");
+       retv_if(bluetooth_check_adapter() != BLUETOOTH_ADAPTER_ENABLED,
+                               BLUETOOTH_ADAPTER_DISABLED);
+
+       retv_if(bluetooth_get_battery_monitor_state() == FALSE,
+                               BLUETOOTH_ERROR_NOT_SUPPORT);
+
+#ifdef TIZEN_FEATURE_BT_DPM
+       retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
+                               BLUETOOTH_ERROR_PERMISSION_DEINED);
+#endif
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_BATTERY_READ_DATA,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Error encountered");
+               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+               return result;
+       }
+
+       info = &g_array_index(out_param, bt_battery_dbus_data_t, 0);
+
+       data->session_start_time = info->session_start_time;
+       data->session_end_time = info->session_end_time;
+       data->session_scan_time = info->session_scan_time;
+       data->session_connected_time = info->session_connected_time;
+       data->atm_list = NULL;
+
+       BT_DBG("Received battery data in bt-api: %ld %ld %d %d.",
+               data->session_start_time, data->session_end_time,
+                       data->session_scan_time, data->session_connected_time);
+
+       /*Copying app wise details*/
+       int n = NUM_APP_MAX < info->num_app ? NUM_APP_MAX : info->num_app; //Maximum NUM_APP_MAX details will be fetched
+
+       for (int i = 0; i < n; i++) {
+               bt_battery_app_data *app_data = NULL;
+               app_data = g_malloc0(sizeof(bt_battery_app_data));
+               memcpy(app_data, &(info->app_data[i]), sizeof(bt_battery_app_data));
+               data->atm_list = g_slist_append(data->atm_list, app_data);
+       }
+
+       if (data->atm_list == NULL) {
+               BT_DBG("No app data transaction in this session");
+               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+               return result;
+       }
+
+       BT_DBG("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 %u", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes, t->time);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
 BT_EXPORT_API int bluetooth_disable_adapter(void)
 {
        int result;
 
        BT_INFO_C("### Disable adapter");
+       _bt_print_api_caller_name();
        BT_CHECK_ENABLED(return);
 
        BT_INIT_PARAMS();
@@ -126,7 +223,7 @@ BT_EXPORT_API int bluetooth_recover_adapter(void)
 {
        int result;
 
-       BT_INFO("Recover adapter");
+       BT_INFO_C("### Recover adapter");
        BT_CHECK_ENABLED(return);
 
        BT_INIT_PARAMS();
@@ -277,25 +374,25 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t
 
        BT_CHECK_PARAMETER(discoverable_mode_ptr, return);
 
-#ifndef TIZEN_PROFILE_WEARABLE
-       int timeout = 0;
-       /* Requirement in OSP */
-       if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
-               if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0) {
-                       BT_ERR("Fail to get the timeout value");
-                       return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
-               }
+       if (!TIZEN_PROFILE_WEARABLE) {
+               int timeout = 0;
+               /* Requirement in OSP */
+               if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
+                       if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0) {
+                               BT_ERR("Fail to get the timeout value");
+                               return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
+                       }
 
-               if (timeout == -1)
-                       *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE;
-               else
-                       *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
+                       if (timeout == -1)
+                               *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE;
+                       else
+                               *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
 
-               return BLUETOOTH_ERROR_NONE;
+                       return BLUETOOTH_ERROR_NONE;
+               }
+       } else {
+               BT_CHECK_ENABLED(return);
        }
-#else
-       BT_CHECK_ENABLED(return);
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -364,6 +461,10 @@ BT_EXPORT_API int bluetooth_start_discovery(unsigned short max_response,
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
+       g_array_append_vals(in_param1, &max_response, sizeof(unsigned short));
+       g_array_append_vals(in_param2, &discovery_duration, sizeof(unsigned short));
+       g_array_append_vals(in_param3, &classOfDeviceMask, sizeof(unsigned int));
+
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_START_DISCOVERY,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 
@@ -449,7 +550,7 @@ BT_EXPORT_API int bluetooth_is_connectable(gboolean *is_connectable)
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
-       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_IS_CONNECTABLE,
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_CONNECTABLE,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 
        if (result == BLUETOOTH_ERROR_NONE)