Correct the privilege check for BT_UPDATE_LE_CONNECTION_MODE

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

diff --git a/bt-api/bt-hid-device.c b/bt-api/bt-hid-device.c
index c9b851a..09710bc 100644 (file)
--- a/bt-api/bt-hid-device.c
+++ b/bt-api/bt-hid-device.c
@@ -97,7 +97,7 @@ static GVariant* __bt_hid_agent_dbus_send(const char *path,
        GDBusProxy *proxy = NULL;
        GDBusConnection *conn = NULL;
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
@@ -472,7 +472,7 @@ int _bt_hid_device_get_fd(const char *address, int *ctrl, int *intr)
        int index1 = 0;
        int index2 = 0;
        GUnixFDList *out_fd_list = NULL;
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        adapter_path = _bt_get_device_object_path((char *)address);
@@ -626,7 +626,8 @@ BT_EXPORT_API int bluetooth_hid_device_activate(void)
                BT_ERR("Error returned in method call");
                if (err) {
                        BT_ERR("Error = %s", err->message);
-                       if (strcmp(err->message, BT_ERROR_ALREADY_EXIST) == 0)
+                       g_dbus_error_strip_remote_error(err);
+                       if (g_strrstr(err->message, BT_ERROR_ALREADY_EXIST))
                                ret = BLUETOOTH_ERROR_IN_PROGRESS;
                        else
                                ret = BLUETOOTH_ERROR_INTERNAL;
@@ -662,7 +663,8 @@ BT_EXPORT_API int bluetooth_hid_device_deactivate(void)
                BT_ERR("Error returned in method call");
                if (err) {
                        BT_ERR("Error = %s", err->message);
-                       if (strcmp(err->message, BT_ERROR_NOT_AVAILABLE) == 0)
+                       g_dbus_error_strip_remote_error(err);
+                       if (g_strrstr(err->message, BT_ERROR_NOT_AVAILABLE))
                                ret = BLUETOOTH_ERROR_NOT_IN_OPERATION;
                        else
                                ret = BLUETOOTH_ERROR_INTERNAL;