Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth_service_record_win.cc

diff --git a/src/device/bluetooth/bluetooth_service_record_win.cc b/src/device/bluetooth/bluetooth_service_record_win.cc
index 48f8723..c4fccde 100644 (file)
--- a/src/device/bluetooth/bluetooth_service_record_win.cc
+++ b/src/device/bluetooth/bluetooth_service_record_win.cc
@@ -121,31 +121,42 @@ BTH_ADDR ConvertToBthAddr(const std::string& address) {
 namespace device {
 
 BluetoothServiceRecordWin::BluetoothServiceRecordWin(
+    const std::string& device_address,
     const std::string& name,
-    const std::string& address,
-    uint64 blob_size,
-    uint8* blob_data) : bth_addr_(ConvertToBthAddr(address)) {
-  name_ = name;
-  address_ = address;
-  supports_rfcomm_ = false;
-  SDP_ELEMENT_DATA protocol_descriptor_list_data;
-  if (ERROR_SUCCESS == BluetoothSdpGetAttributeValue(
-      blob_data,
-      blob_size,
-      kProtocolDescriptorListId,
-      &protocol_descriptor_list_data)) {
-    ExtractChannels(protocol_descriptor_list_data,
-                    &supports_rfcomm_,
-                    &rfcomm_channel_);
-  }
-  SDP_ELEMENT_DATA uuid_data;
-  if (ERROR_SUCCESS == BluetoothSdpGetAttributeValue(
-      blob_data,
-      blob_size,
-      kUuidId,
-      &uuid_data)) {
-    ExtractUuid(uuid_data, &uuid_);
+    const std::vector<uint8>& sdp_bytes,
+    const BluetoothUUID& gatt_uuid)
+    : device_bth_addr_(ConvertToBthAddr(device_address)),
+      device_address_(device_address),
+      name_(name),
+      uuid_(gatt_uuid),
+      supports_rfcomm_(false),
+      rfcomm_channel_(0xFF) {
+  // Bluetooth 2.0
+  if (sdp_bytes.size() > 0) {
+    LPBYTE blob_data = const_cast<LPBYTE>(&sdp_bytes[0]);
+    ULONG blob_size = static_cast<ULONG>(sdp_bytes.size());
+    SDP_ELEMENT_DATA protocol_descriptor_list_data;
+    if (ERROR_SUCCESS ==
+        BluetoothSdpGetAttributeValue(blob_data,
+                                      blob_size,
+                                      kProtocolDescriptorListId,
+                                      &protocol_descriptor_list_data)) {
+      ExtractChannels(
+          protocol_descriptor_list_data, &supports_rfcomm_, &rfcomm_channel_);
+    }
+    SDP_ELEMENT_DATA uuid_data;
+    if (ERROR_SUCCESS == BluetoothSdpGetAttributeValue(
+                             blob_data, blob_size, kUuidId, &uuid_data)) {
+      ExtractUuid(uuid_data, &uuid_);
+    }
   }
 }
 
+bool BluetoothServiceRecordWin::IsEqual(
+    const BluetoothServiceRecordWin& other) {
+  return device_address_ == other.device_address_ && name_ == other.name_ &&
+         uuid_ == other.uuid_ && supports_rfcomm_ == other.supports_rfcomm_ &&
+         rfcomm_channel_ == other.rfcomm_channel_;
+}
+
 }  // namespace device