Return NOT_PAIRED error in case the device is not paired

Change-Id: Iddcf19eab8854f12d7ad6981025c229d740e91d4
Signed-off-by: Deokhyun Kim <dukan.kim@samsung.com>
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
index dd131bc..8ed366f 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
@@ -187,7 +187,7 @@ int _bt_hal_device_remove_bond(const bt_bdaddr_t *bd_addr)
           in case of bluez*/
        if (device_path == NULL) {
                ERR("No paired device");
-               return BT_STATUS_FAIL;
+               return BT_STATUS_NOT_PAIRED;
        }
 
        conn = _bt_hal_get_system_gconn();
@@ -197,7 +197,6 @@ int _bt_hal_device_remove_bond(const bt_bdaddr_t *bd_addr)
                return BT_STATUS_FAIL;
        }
 
-
        device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
                        NULL, BT_HAL_BLUEZ_NAME,
                        device_path, BT_HAL_PROPERTIES_INTERFACE,  NULL, NULL);
@@ -218,7 +217,7 @@ int _bt_hal_device_remove_bond(const bt_bdaddr_t *bd_addr)
                        if (!ret) {
                                ERR("No paired device");
                                g_object_unref(device_proxy);
-                               return BT_STATUS_FAIL;
+                               return BT_STATUS_NOT_PAIRED;
                        }
 
                        g_variant_get(ret, "(v)", &value);
@@ -232,7 +231,7 @@ int _bt_hal_device_remove_bond(const bt_bdaddr_t *bd_addr)
 
        if (is_paired == FALSE) {
                ERR("No paired device");
-               return BT_STATUS_FAIL;
+               return BT_STATUS_NOT_PAIRED;
        }
 
        g_dbus_proxy_call(adapter_proxy, "UnpairDevice",

diff --git a/bt-oal/common/oal-common.c b/bt-oal/common/oal-common.c
index 032b2c6..a367159 100644 (file)
--- a/bt-oal/common/oal-common.c
+++ b/bt-oal/common/oal-common.c
@@ -182,6 +182,9 @@ oal_status_t convert_to_oal_status(bt_status_t status)
        case BT_STATUS_UNSUPPORTED:
                ret = OAL_STATUS_NOT_SUPPORT;
                break;
+       case BT_STATUS_NOT_PAIRED:
+               ret = OAL_STATUS_NOT_PAIRED;
+               break;
        case BT_STATUS_CONN_TOUT:
                ret = OAL_STATUS_LINK_LOSS;
                break;

diff --git a/bt-oal/hardware/bluetooth.h b/bt-oal/hardware/bluetooth.h
index 7c0bbac..7cda2ee 100644 (file)
--- a/bt-oal/hardware/bluetooth.h
+++ b/bt-oal/hardware/bluetooth.h
@@ -91,6 +91,7 @@ typedef enum {
        BT_STATUS_UNHANDLED,
        BT_STATUS_AUTH_FAILURE,
        BT_STATUS_RMT_DEV_DOWN,
+       BT_STATUS_NOT_PAIRED,
 #ifndef TIZEN_BT_HAL
        BT_STATUS_CONN_TOUT   /* disconnection due to supervision timeout */
 #else

diff --git a/bt-oal/include/oal-manager.h b/bt-oal/include/oal-manager.h
index f26a784..dc4fa39 100755 (executable)
--- a/bt-oal/include/oal-manager.h
+++ b/bt-oal/include/oal-manager.h
@@ -71,6 +71,7 @@ typedef enum {
        OAL_STATUS_RMT_DEVICE_DOWN,
        OAL_STATUS_AUTH_FAILED,
        OAL_STATUS_NOT_SUPPORT, //For APIs not supported
+       OAL_STATUS_NOT_PAIRED,
        OAL_STATUS_ALREADY_DONE,
        OAL_STATUS_PENDING,
        OAL_STATUS_CONN_TIMEOUT,

diff --git a/bt-service-adaptation/services/device/bt-service-core-device.c b/bt-service-adaptation/services/device/bt-service-core-device.c
index ef7361c..33867f8 100644 (file)
--- a/bt-service-adaptation/services/device/bt-service-core-device.c
+++ b/bt-service-adaptation/services/device/bt-service-core-device.c
@@ -1866,7 +1866,7 @@ int _bt_unbond_device(bluetooth_device_address_t *device_address,
        if (result != OAL_STATUS_SUCCESS)
                goto fail;
 
-       return result;
+       return BLUETOOTH_ERROR_NONE;
 
 fail:
        memset(&dev_info, 0x00, sizeof(bluetooth_device_info_t));
@@ -1877,7 +1877,10 @@ fail:
                        sizeof(bluetooth_device_info_t));
        __bt_free_bond_info(BT_DEVICE_UNBOND_INFO);
 
-       return result;
+       if (result == OAL_STATUS_NOT_PAIRED)
+               return BLUETOOTH_ERROR_NOT_PAIRED;
+
+       return BLUETOOTH_ERROR_INTERNAL;
 }
 
 int _bt_cancel_bonding(void)