Revert "Identify whether device is already registered and not"

This reverts commit 5ac8bb7cef537a0db489b1a364c4bffbf8ca0dbf.

Change-Id: I5164eb00ff30c9006786ce963ba1810023588364

diff --git a/include/ua-api.h b/include/ua-api.h
index 43b6926..8d57f07 100644 (file)
--- a/include/ua-api.h
+++ b/include/ua-api.h
@@ -480,15 +480,6 @@ typedef enum {
 } uam_tech_type_e;
 
 /**
- * @brief Enumerations for device is already registered or not.
- * @since_tizen 5.5
- */
-typedef enum {
-       UAM_DEVICE_IS_NOT_REGISTERED = 0x00, /**< Device is not registered */
-       UAM_DEVICE_IS_ALREADY_REGISTERED = 0x01, /**< Device already registered */
-} uam_is_new_device_e;
-
-/**
  * @brief BLE Payload info structure.
  * @since_tizen 5.5
  */

diff --git a/ua-daemon/include/ua-manager-core.h b/ua-daemon/include/ua-manager-core.h
index 72a200c..01b653d 100644 (file)
--- a/ua-daemon/include/ua-manager-core.h
+++ b/ua-daemon/include/ua-manager-core.h
@@ -180,8 +180,8 @@ void _uam_core_deinit(void);
 
 void _uam_core_handle_sensor_ready(unsigned int sensor, gboolean is_ready);
 
-int _uam_core_handle_device_added(int status, int user_id,
-               const uam_device_info_s *dev_info, int is_new_device);
+int _uam_core_handle_device_added(int status,
+               int user_id, const uam_device_info_s *dev_info);
 
 int _uam_core_handle_presence_detected(unsigned int sensor,
                int user_id, void *sensor_info);

diff --git a/ua-daemon/src/pm/ua-ble-plugin-handler.c b/ua-daemon/src/pm/ua-ble-plugin-handler.c
index 88b8e7a..da39bbe 100644 (file)
--- a/ua-daemon/src/pm/ua-ble-plugin-handler.c
+++ b/ua-daemon/src/pm/ua-ble-plugin-handler.c
@@ -110,8 +110,7 @@ static void ble_device_added_callback(int status, uas_device_info_t *device)
        else
                status = UAM_ERROR_NONE;
 
-       _uam_core_handle_device_added(status, device->user_id, dev_info,
-                                     UAM_DEVICE_IS_NOT_REGISTERED);
+       _uam_core_handle_device_added(status, device->user_id, dev_info);
        g_free(dev_info);
        FUNC_EXIT;
 }

diff --git a/ua-daemon/src/pm/ua-wifi-plugin-handler.c b/ua-daemon/src/pm/ua-wifi-plugin-handler.c
index d2f2568..b81fa40 100644 (file)
--- a/ua-daemon/src/pm/ua-wifi-plugin-handler.c
+++ b/ua-daemon/src/pm/ua-wifi-plugin-handler.c
@@ -110,8 +110,7 @@ static void wifi_device_added_callback(int status, uas_device_info_t *device)
                status = UAM_ERROR_NONE;
 
        UAM_INFO("[%d]", device->user_id);
-       _uam_core_handle_device_added(status, device->user_id, dev_info,
-                                       UAM_DEVICE_IS_NOT_REGISTERED);
+       _uam_core_handle_device_added(status, device->user_id, dev_info);
        g_free(dev_info);
        FUNC_EXIT;
 }

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index da0a258..6259d70 100644 (file)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -666,11 +666,6 @@ static void __uam_core_add_dev_to_list(
        l = g_slist_find_custom(devices, dev_info->device_id, __compare_device_id);
        if (NULL != l) {
                device = l->data;
-               /**
-                * TODO: UAM_DEVICE_IS_ALREADY_REGISTERED
-                * 1. Check if user exists or not and accordingly,
-                * 2. Update user->dev, dev->user. dev_user_table and dev_user_list.
-                */
                ret_if(user != device->user);
                ret_if(device->supported_techs & dev_info->type);
 
@@ -897,11 +892,6 @@ int _uam_core_add_device(const char *account, const uam_device_info_s *dev_info)
        l = g_slist_find_custom(devices, dev_info->device_id, __compare_device_id);
        if (NULL != l) {
                device = l->data;
-               /**
-                * TODO: UAM_DEVICE_IS_ALREADY_REGISTERED
-                * 1. Check whether device and user association already exists or not?
-                * 2. If association exists, update device details and send device added callback.
-                */
                retv_if(user != device->user, UAM_ERROR_ALREADY_REGISTERED);
                retv_if((dev_info->type & device->supported_techs),
                                UAM_ERROR_ALREADY_REGISTERED);
@@ -2503,8 +2493,8 @@ void _uam_core_handle_sensor_ready(unsigned int sensor, gboolean is_ready)
        FUNC_EXIT;
 }
 
-int _uam_core_handle_device_added(int status, int user_id,
-               const uam_device_info_s *dev_info, int is_new_device)
+int _uam_core_handle_device_added(int status,
+               int user_id, const uam_device_info_s *dev_info)
 {
        FUNC_ENTRY;