| Index: device/bluetooth/bluetooth_gatt_descriptor.cc
|
| diff --git a/device/bluetooth/bluetooth_gatt_descriptor.cc b/device/bluetooth/bluetooth_gatt_descriptor.cc
|
| index 4746cadefc056e9d684afb4a732d4f6efd6ecfe7..692e2585f6a62aeddcd4ba165b994e2f4aeb6070 100644
|
| --- a/device/bluetooth/bluetooth_gatt_descriptor.cc
|
| +++ b/device/bluetooth/bluetooth_gatt_descriptor.cc
|
| @@ -8,20 +8,18 @@
|
|
|
| namespace device {
|
|
|
| -using bluetooth_utils::UUID;
|
| -
|
| -const UUID BluetoothGattDescriptor::
|
| - kCharacteristicExtendedPropertiesUuid("0x2900");
|
| -const UUID BluetoothGattDescriptor::
|
| - kCharacteristicUserDescriptionUuid("0x2901");
|
| -const UUID BluetoothGattDescriptor::
|
| - kClientCharacteristicConfigurationUuid("0x2902");
|
| -const UUID BluetoothGattDescriptor::
|
| - kServerCharacteristicConfigurationUuid("0x2903");
|
| -const UUID BluetoothGattDescriptor::
|
| - kCharacteristicPresentationFormatUuid("0x2904");
|
| -const UUID BluetoothGattDescriptor::
|
| - kCharacteristicAggregateFormatUuid("0x2905");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kCharacteristicExtendedPropertiesUuid("2900");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kCharacteristicUserDescriptionUuid("2901");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kClientCharacteristicConfigurationUuid("2902");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kServerCharacteristicConfigurationUuid("2903");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kCharacteristicPresentationFormatUuid("2904");
|
| +const BluetoothUUID BluetoothGattDescriptor::
|
| + kCharacteristicAggregateFormatUuid("2905");
|
|
|
| BluetoothGattDescriptor::BluetoothGattDescriptor() {
|
| }
|
| @@ -31,7 +29,7 @@ BluetoothGattDescriptor::~BluetoothGattDescriptor() {
|
|
|
| // static
|
| BluetoothGattDescriptor* BluetoothGattDescriptor::Create(
|
| - const bluetooth_utils::UUID& uuid,
|
| + const BluetoothUUID& uuid,
|
| const std::vector<uint8>& value) {
|
| LOG(ERROR) << "Creating local GATT characteristic descriptors currently not "
|
| << "supported.";
|
|
|