Index: components/arc/bluetooth/arc_bluetooth_bridge.cc |
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.cc b/components/arc/bluetooth/arc_bluetooth_bridge.cc |
index b17ea3c835159d42064efa96b22dca7b72202501..9786c161243bfb3bdf79ab55bbbdc6b9d30c2fb0 100644 |
--- a/components/arc/bluetooth/arc_bluetooth_bridge.cc |
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.cc |
@@ -45,13 +45,14 @@ using device::BluetoothRemoteGattService; |
using device::BluetoothUUID; |
namespace { |
-const int kMinBtleVersion = 1; |
-const uint32_t kGattReadPermission = |
+constexpr int32_t kMinBtleVersion = 1; |
+constexpr int32_t kMinBtleNotifyVersion = 2; |
+constexpr uint32_t kGattReadPermission = |
BluetoothGattCharacteristic::Permission::PERMISSION_READ | |
BluetoothGattCharacteristic::Permission::PERMISSION_READ_ENCRYPTED | |
BluetoothGattCharacteristic::Permission:: |
PERMISSION_READ_ENCRYPTED_AUTHENTICATED; |
-const uint32_t kGattWritePermission = |
+constexpr uint32_t kGattWritePermission = |
BluetoothGattCharacteristic::Permission::PERMISSION_WRITE | |
BluetoothGattCharacteristic::Permission::PERMISSION_WRITE_ENCRYPTED | |
BluetoothGattCharacteristic::Permission:: |
@@ -131,10 +132,8 @@ void ArcBluetoothBridge::DeviceAdded(BluetoothAdapter* adapter, |
arc_bridge_service()->bluetooth_instance()->OnDeviceFound( |
std::move(properties)); |
- if (arc_bridge_service()->bluetooth_version() < kMinBtleVersion) { |
- LOG(WARNING) << "Bluetooth instance is too old and does not support BTLE"; |
+ if (!CheckBluetoothInstanceVersion(kMinBtleVersion)) |
return; |
- } |
mojom::BluetoothAddressPtr addr = |
mojom::BluetoothAddress::From(device->GetAddress()); |
@@ -205,10 +204,8 @@ void ArcBluetoothBridge::GattServicesDiscovered(BluetoothAdapter* adapter, |
if (!HasBluetoothInstance()) |
return; |
- if (arc_bridge_service()->bluetooth_version() < kMinBtleVersion) { |
- LOG(WARNING) << "Bluetooth instance is too old and does not support BTLE"; |
+ if (!CheckBluetoothInstanceVersion(kMinBtleVersion)) |
return; |
- } |
mojom::BluetoothAddressPtr addr = |
mojom::BluetoothAddress::From(device->GetAddress()); |
@@ -257,7 +254,30 @@ void ArcBluetoothBridge::GattCharacteristicValueChanged( |
BluetoothAdapter* adapter, |
BluetoothRemoteGattCharacteristic* characteristic, |
const std::vector<uint8_t>& value) { |
- // Placeholder for GATT client functionality |
+ if (!HasBluetoothInstance()) |
+ return; |
+ |
+ if (!CheckBluetoothInstanceVersion(kMinBtleNotifyVersion)) |
+ return; |
+ |
+ BluetoothRemoteGattService* service = characteristic->GetService(); |
+ BluetoothDevice* device = service->GetDevice(); |
+ mojom::BluetoothAddressPtr address = |
+ mojom::BluetoothAddress::From(device->GetAddress()); |
+ mojom::BluetoothGattServiceIDPtr service_id = |
+ mojom::BluetoothGattServiceID::New(); |
+ service_id->is_primary = service->IsPrimary(); |
+ service_id->id = mojom::BluetoothGattID::New(); |
+ service_id->id->inst_id = ConvertGattIdentifierToId(service->GetIdentifier()); |
+ service_id->id->uuid = mojom::BluetoothUUID::From(service->GetUUID()); |
+ |
+ mojom::BluetoothGattIDPtr char_id = mojom::BluetoothGattID::New(); |
+ char_id->inst_id = ConvertGattIdentifierToId(characteristic->GetIdentifier()); |
+ char_id->uuid = mojom::BluetoothUUID::From(characteristic->GetUUID()); |
+ |
+ arc_bridge_service()->bluetooth_instance()->OnGattNotify( |
+ std::move(address), std::move(service_id), std::move(char_id), |
+ true /* is_notify */, mojo::Array<uint8_t>::From(value)); |
} |
void ArcBluetoothBridge::GattDescriptorValueChanged( |
@@ -537,10 +557,8 @@ void ArcBluetoothBridge::OnGattConnectStateChanged( |
if (!HasBluetoothInstance()) |
return; |
- if (arc_bridge_service()->bluetooth_version() < kMinBtleVersion) { |
- LOG(WARNING) << "Bluetooth instance is too old and does not support BTLE"; |
+ if (!CheckBluetoothInstanceVersion(kMinBtleVersion)) |
return; |
- } |
DCHECK(addr); |
@@ -902,6 +920,19 @@ void ArcBluetoothBridge::WriteGattDescriptor( |
DCHECK(descriptor); |
DCHECK(descriptor->GetPermissions() & kGattWritePermission); |
+ // To register / deregister GATT notification, we need to |
+ // 1) Write to CCC Descriptor to enable/disable the notification |
+ // 2) Ask BT hw to register / deregister the notification |
+ // The Chrome API groups both steps into one API, and does not support writing |
+ // directly to the CCC Descriptor. Therefore, until we fix |
+ // https://crbug.com/622832, we return successfully when we encounter this. |
+ // TODO(http://crbug.com/622832) |
+ if (descriptor->GetUUID() == |
+ BluetoothGattDescriptor::ClientCharacteristicConfigurationUuid()) { |
+ OnGattWriteDone(callback); |
+ return; |
+ } |
+ |
descriptor->WriteRemoteDescriptor( |
value->value.To<std::vector<uint8_t>>(), |
base::Bind(&ArcBluetoothBridge::OnGattWriteDone, |
@@ -1317,4 +1348,14 @@ void ArcBluetoothBridge::SendCachedPairedDevices() const { |
} |
} |
+bool ArcBluetoothBridge::CheckBluetoothInstanceVersion( |
+ int32_t version_need) const { |
+ int32_t version = arc_bridge_service()->bluetooth_version(); |
+ if (version < version_need) |
Luis Héctor Chávez
2016/06/27 21:54:40
shouldn't this be >=?
puthik_chromium
2016/06/27 21:59:22
Yes. My bad.
|
+ return true; |
+ LOG(WARNING) << "Bluetooth instance is too old (version " << version |
+ << ") need version " << version_need; |
+ return false; |
+} |
+ |
} // namespace arc |