Correct the privilege check for BT_UPDATE_LE_CONNECTION_MODE

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

diff --git a/bt-api/bt-telephony.c b/bt-api/bt-telephony.c
index 8ae305d..498a422 100644 (file)
--- a/bt-api/bt-telephony.c
+++ b/bt-api/bt-telephony.c
@@ -73,6 +73,7 @@ static guint owner_id = 0;
 #define HFP_REJECT_CALL "Reject"
 #define HFP_RELEASE_CALL "Release"
 #define HFP_THREEWAY_CALL "Threeway"
+#define HFP_HF_BATTERY_LEVEL_CHANGE "HfBatteryLevelChanged"
 
 #define DEFAULT_ADAPTER_OBJECT_PATH "/org/bluez/hci0"
 
@@ -480,6 +481,20 @@ static void __bluetooth_handle_nrec_status_change(GVariant *var)
 
 }
 
+static void __bluetooth_telephony_hf_battery_level_change(GVariant *var)
+{
+       telephony_event_hf_battery_level_t param;
+       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+       g_variant_get(var, "(&su)", &param.remote_address, &param.battery_level);
+
+       _bt_convert_addr_string_to_secure_string(secure_address, param.remote_address);
+       BT_INFO("address(%s) battery level(%u)", secure_address, param.battery_level);
+
+       __bt_telephony_event_cb(BLUETOOTH_EVENT_TELEPHONY_HF_BATTERY_LEVEL_CHANGED,
+               BLUETOOTH_TELEPHONY_ERROR_NONE, (void *)&param);
+}
+
 static void __bluetooth_telephony_event_filter(GDBusConnection *connection,
                const gchar *sender_name,
                const gchar *object_path,
@@ -625,6 +640,8 @@ static void __bluetooth_telephony_event_filter(GDBusConnection *connection,
                        __bluetooth_telephony_release_call(parameters);
                else if (strcasecmp(signal_name, HFP_THREEWAY_CALL) == 0)
                        __bluetooth_telephony_threeway_call(parameters);
+               else if (strcasecmp(signal_name, HFP_HF_BATTERY_LEVEL_CHANGE) == 0)
+                       __bluetooth_telephony_hf_battery_level_change(parameters);
        }
        BT_DBG("-");
 }
@@ -659,7 +676,6 @@ int __bluetooth_telephony_register_object(int reg, GDBusNodeInfo *node_info)
                        return BLUETOOTH_TELEPHONY_ERROR_INVALID_PARAM;
 
                path = g_strdup(telephony_info.call_path);
-               BT_DBG("path is [%s]", path);
 
                bt_tel_id = g_dbus_connection_register_object(telephony_dbus_info.conn,
                                path, node_info->interfaces[0],
@@ -690,11 +706,10 @@ static int __bluetooth_telephony_proxy_init(void)
        gchar *name;
 
        name = g_strdup_printf("org.tizen.csd.Call.Instance.p%d", getpid());
-       BT_DBG("well-known name: %s", name);
 
        owner_id = g_bus_own_name_on_connection(telephony_dbus_info.conn,
                                name, G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL);
-       BT_DBG("owner_id: %d", owner_id);
+       BT_DBG("well-known name: %s, owner_id: %d", name, owner_id);
        g_free(name);
 
        node_info = __bt_telephony_create_method_node_info(
@@ -929,7 +944,7 @@ static int __bluetooth_telephony_get_connected_device(void)
        int ret = BLUETOOTH_TELEPHONY_ERROR_NONE;
 
        FN_START;
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        retv_if(conn == NULL, BLUETOOTH_TELEPHONY_ERROR_INTERNAL);
 
        manager_proxy = g_dbus_proxy_new_sync(
@@ -1690,7 +1705,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_open(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -1763,7 +1778,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_close(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -2177,6 +2192,44 @@ BT_EXPORT_API int bluetooth_telephony_get_headset_volume(
        return BLUETOOTH_TELEPHONY_ERROR_NONE;
 }
 
+BT_EXPORT_API int bluetooth_telephony_get_battery_level(
+                       const char *remote_address, unsigned int *level)
+{
+       GVariant *reply;
+       GError *err = NULL;
+       GVariant *param = NULL;
+       int ret;
+
+       FN_START;
+
+       BT_TELEPHONY_CHECK_INITIALIZED();
+       BT_TELEPHONY_CHECK_ENABLED();
+
+       param = g_variant_new("(s)", remote_address);
+
+       reply = __bluetooth_telephony_dbus_method_send(
+                       HFP_AGENT_PATH, HFP_AGENT_INTERFACE,
+                       "GetHfBatteryLevel", &err, param);
+
+       if (!reply) {
+               BT_ERR("Error returned in method call\n");
+               if (err) {
+                       g_dbus_error_strip_remote_error(err);
+                       ret = __bt_telephony_get_error(err->message);
+                       g_error_free(err);
+                       return ret;
+               }
+               return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
+       }
+
+       g_variant_get(reply, "(u)", level);
+
+       g_variant_unref(reply);
+
+       FN_END;
+       return BLUETOOTH_TELEPHONY_ERROR_NONE;
+}
+
 BT_EXPORT_API int bluetooth_telephony_is_connected(gboolean *ag_connected)
 {
        GVariant *reply;
@@ -2212,7 +2265,6 @@ BT_EXPORT_API int bluetooth_telephony_is_connected(gboolean *ag_connected)
 
 BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr)
 {
-#ifdef TIZEN_BT_DUAL_HEADSET_CONNECT
        GVariant *reply;
        GVariant *param;
        GError *err = NULL;
@@ -2241,9 +2293,6 @@ BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr
 
        g_variant_unref(reply);
        return BLUETOOTH_TELEPHONY_ERROR_NONE;
-#else
-       return BLUETOOTH_ERROR_NOT_SUPPORT;
-#endif
 }
 
 static void __bt_telephony_adapter_filter(GDBusConnection *connection,
@@ -2269,7 +2318,6 @@ static void __bt_telephony_adapter_filter(GDBusConnection *connection,
                        return;
                }
 
-               BT_DBG("Adapter Path = [%s]", path);
                if (strcasecmp(path, DEFAULT_ADAPTER_OBJECT_PATH) == 0) {
                        if (__bt_telephony_get_src_addr(optional_param))
                                BT_ERR("Fail to get the local adapter address");