Use the local state for battery monitor state

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-adapter.c

diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c
index e345387..fc41fa2 100644 (file)
--- a/bt-api/bt-adapter.c
+++ b/bt-api/bt-adapter.c
@@ -29,6 +29,15 @@
 #define VCONFKEY_BATTERY_MONITOR_STATUS "db/bluetooth/bmstatus"
 #endif
 
+
+typedef enum {
+       BT_MONITOR_NONE = -1,
+       BT_MONITOR_OFF = 0,
+       BT_MONITOR_ON = 1,
+} bt_battery_monitor_state_t;
+
+static int battery_monitor_state = BT_MONITOR_NONE;
+
 static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
 {
        int i;
@@ -112,21 +121,62 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
 
 BT_EXPORT_API int bluetooth_set_battery_monitor_state(bool state)
 {
-       BT_INFO("Setting vconf key");
-       if (vconf_set_int(VCONFKEY_BATTERY_MONITOR_STATUS, state) != 0)
+       if (vconf_set_bool(VCONFKEY_BATTERY_MONITOR_STATUS, state) != 0)
        {
-               BT_ERR("vconf_set_int failed");
+               BT_ERR("vconf_set_bool failed");
                return BLUETOOTH_ERROR_INTERNAL;
        }
+
+       battery_monitor_state = (state == false) ? BT_MONITOR_OFF : BT_MONITOR_ON;
+
        return BLUETOOTH_ERROR_NONE;
 }
 
+static void __bt_battery_monitor_status_changed_cb(keynode_t *node, void *data)
+{
+       gboolean status = FALSE;
+       int type;
+
+       type = vconf_keynode_get_type(node);
+       if (type == VCONF_TYPE_BOOL) {
+               status = vconf_keynode_get_bool(node);
+
+               BT_DBG("Update the monitor state to %d", status);
+
+               battery_monitor_state = (status == FALSE) ? BT_MONITOR_OFF : BT_MONITOR_ON;
+       } else {
+               BT_ERR("Invaild vconf key type : %d", type);
+               return;
+       }
+}
+
+void _bt_reset_battery_monitor_info(void)
+{
+       vconf_ignore_key_changed(VCONFKEY_BATTERY_MONITOR_STATUS,
+                       (vconf_callback_fn)__bt_battery_monitor_status_changed_cb);
+
+       _bt_rfcomm_server_reset_timer();
+       _bt_rfcomm_client_reset_timer();
+
+       battery_monitor_state = BT_MONITOR_NONE;
+}
+
 BT_EXPORT_API int bluetooth_get_battery_monitor_state()
 {
        int state = 0;
-       BT_INFO("Getting vconf key value");
-       if (vconf_get_int(VCONFKEY_BATTERY_MONITOR_STATUS, &state) != 0)
-               BT_ERR("vconf_get_int failed");
+
+       if (battery_monitor_state != BT_MONITOR_NONE)
+               return battery_monitor_state;
+
+       if (vconf_get_bool(VCONFKEY_BATTERY_MONITOR_STATUS, &state) != 0)
+               BT_ERR("vconf_get_bool failed");
+
+       battery_monitor_state = state;
+
+       if (vconf_notify_key_changed(VCONFKEY_BATTERY_MONITOR_STATUS,
+               (vconf_callback_fn)__bt_battery_monitor_status_changed_cb, NULL) < 0)
+                       BT_ERR("Unable to register key handler");
+
        return state;
 }
 
@@ -192,7 +242,7 @@ BT_EXPORT_API int bluetooth_read_battery_data(bt_battery_data *data)
        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", (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);
        }
 
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -550,7 +600,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)