Add appearance to device info for Tizen2.3

The param of appearance is added to device info in Tizen2.3.

Change-Id: Ifd87def885d5025a86876efa7a12cbcb93b97e4d
Signed-off-by: Wu Zheng <wu.zheng@intel.com>

diff --git a/capi/bluetooth.c b/capi/bluetooth.c
index 617d5243fc7c034dc91202ec28450cb8e0f86b51..4d2f428cbc75c7a9c31d35906a32bc8ab9f98e92 100644 (file)
--- a/capi/bluetooth.c
+++ b/capi/bluetooth.c
@@ -419,11 +419,32 @@ static bt_adapter_device_discovery_info_s *get_discovery_device_info(
        device_info->rssi = device_discovery_info->rssi;
        device_info->is_bonded = device_discovery_info->is_bonded;
        device_info->service_uuid = device_discovery_info->service_uuid;
-       device_info->appearance = device_discovery_info->appearance;
 
        divide_device_class(&device_info->bt_class,
                                        device_discovery_info->bt_class);
 
+       if (device_discovery_info->appearance)
+               device_info->appearance = device_discovery_info->appearance;
+       else {
+               if (device_info->bt_class.major_device_class ==
+                       BT_MAJOR_DEVICE_CLASS_COMPUTER)
+                       device_discovery_info->appearance =
+                               BT_APPEARANCE_TYPE_GENERIC_COMPUTER;
+               else if (device_info->bt_class.major_device_class ==
+                       BT_MAJOR_DEVICE_CLASS_PHONE)
+                       device_discovery_info->appearance =
+                               BT_APPEARANCE_TYPE_GENERIC_PHONE;
+               else if (device_info->bt_class.major_device_class ==
+                       BT_MAJOR_DEVICE_CLASS_WEARABLE &&
+                       device_info->bt_class.minor_device_class ==
+                       BT_MINOR_DEVICE_CLASS_WEARABLE_WRIST_WATCH)
+                       device_discovery_info->appearance =
+                               BT_APPEARANCE_TYPE_GENERIC_WATCH;
+               else
+                       device_discovery_info->appearance =
+                               BT_APPEARANCE_TYPE_UNKNOWN;
+       }
+
        return device_info;
 }
 

diff --git a/lib/common.c b/lib/common.c
index aeb58867a58d06752ebf5f10728ad2c97128c5e1..11cb96aabc0e09368d17067ccfc0c313f7bd630b 100644 (file)
--- a/lib/common.c
+++ b/lib/common.c
@@ -479,7 +479,7 @@ GDBusConnection *get_system_lib_dbus_connect(void)
 unsigned int convert_appearance_to_type(unsigned int appearance)
 {
        /*todo support it later*/
-       return 0x00;
+       return appearance;
 }
 
 char **convert_uuid_to_profiles(char **uuids)

diff --git a/test/bluez-capi-test.c b/test/bluez-capi-test.c
index 50d2032c07ba2b9c50912ddaf7cb914bf8349c99..370b943ae6e5b3f9850f6d0a4a700800d3f4f833 100644 (file)
--- a/test/bluez-capi-test.c
+++ b/test/bluez-capi-test.c
@@ -629,6 +629,7 @@ static void device_discovery_cb(int result,
                DBG("\tRSSI: %d", discovery_info->rssi);
                DBG("\tIs bonded: %d", discovery_info->is_bonded);
                DBG("\tservice_count: %d", discovery_info->service_count);
+               DBG("\tappearance: %x", discovery_info->appearance);
 
                for (len = 0; len < discovery_info->service_count; len++)
                        DBG("\t service %d: %s", len,