arc: bluetooth: Fix advertised uuid

components/arc/bluetooth/arc_bluetooth_bridge.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
 
 #include <bluetooth/bluetooth.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 1524 matching lines @@
   mojo::Array<mojom::BluetoothAdvertisingDataPtr> advertising_data;
 
   // LocalName
   mojom::BluetoothAdvertisingDataPtr local_name =
       mojom::BluetoothAdvertisingData::New();
   local_name->set_local_name(device->GetName() ? device->GetName().value()
                                                : nullptr);
   advertising_data.push_back(std::move(local_name));
 
   // ServiceUuid
-  BluetoothDevice::UUIDList uuid_list = device->GetServiceDataUUIDs();
+  BluetoothDevice::UUIDList uuid_list = device->GetUUIDs();

[Luis Héctor Chávez, 2016/08/15 21:23:12]

nit: const BluetoothDevice::UUIDList&

[Luis Héctor Chávez, 2016/08/15 21:25:43]

ignore this, I double checked and the code is correct as-is.

   if (uuid_list.size() > 0) {
     mojom::BluetoothAdvertisingDataPtr service_uuids =
         mojom::BluetoothAdvertisingData::New();
     service_uuids->set_service_uuids(
         mojo::Array<mojom::BluetoothUUIDPtr>::From(uuid_list));
     advertising_data.push_back(std::move(service_uuids));
   }
 
   // Service data
-  for (auto& uuid : uuid_list) {
+  for (auto& uuid : device->GetServiceDataUUIDs()) {
     base::BinaryValue* data = device->GetServiceData(uuid);
     if (data->GetSize() == 0)
       continue;
     std::string data_str;
     if (!data->GetAsString(&data_str))
       continue;
 
     mojom::BluetoothAdvertisingDataPtr service_data_element =
         mojom::BluetoothAdvertisingData::New();
     mojom::BluetoothServiceDataPtr service_data =
         mojom::BluetoothServiceData::New();
 
     std::string uuid_str = uuid.canonical_value();
     // Convert xxxxyyyy-xxxx-xxxx-xxxx-xxxxxxxxxxxx to int16 yyyy

[ortuno, 2016/08/15 21:27:09]

Out of curiosity: Does android really expect only an int16? This could cause
unexpected collisions if true e.g.:


e5b0180d-d3a3-45c1-a019-ea3c00d8d739 <- Custom UUID
0000180d-0000-1000-8000-00805F9B34FB <- Standard Heart Rate Service

Both of these would be seen as a Heart Rate Service...

[puthik_chromium, 2016/08/15 21:32:15]

Unfortunately yes[1]. The advertised service uuid is also need to be in
uuid16[2]. (This will be in another patch)

[1]
https://android.googlesource.com/platform/frameworks/base/+/android-n-preview...
[2]
https://android.googlesource.com/platform/packages/apps/Bluetooth/+/android-n...

[ortuno, 2016/08/15 21:37:33]

*sigh* ok

     service_data->uuid_16bit = std::stoi(uuid_str.substr(4, 4), nullptr, 16);
     for (auto& c : data_str) {
       service_data->data.push_back(c);
     }
     service_data_element->set_service_data(std::move(service_data));
     advertising_data.push_back(std::move(service_data_element));
   }
 
   return advertising_data;
 }
@@ skipping 82 matching lines @@
   LOG(WARNING) << "Bluetooth instance is too old (version " << version
                << ") need version " << version_need;
   return false;
 }
 
 bool ArcBluetoothBridge::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc