diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-08-27 12:19:11 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-03 12:54:38 +0200 |
| commit | aaada70924dd53dbc9763581bc076ddb1aa8c9c9 (patch) | |
| tree | 94e099e1e26b6a8738f15955e94f89b5e8cf6420 /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | 5a694018992051a3c99339d5860eda4bbb703275 (diff) | |
Set ATT as protocol descriptor for BTLE SDP records
At the same time we fix up some cases where the ProtocolDescriptorList
was not a list within a list.
Change-Id: If0ec6cf6374902a47a905edd08523906be9fd86b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index fb956c9e..d82a73a8 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -448,7 +448,16 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_createdDevice(QDBusPendingCallWa service.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); QBluetoothServiceInfo::Sequence protocolDescriptorList; - protocolDescriptorList << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::L2cap)); + { + QBluetoothServiceInfo::Sequence protocol; + protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::L2cap)); + protocolDescriptorList.append(QVariant::fromValue(protocol)); + } + { + QBluetoothServiceInfo::Sequence protocol; + protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Att)); + protocolDescriptorList.append(QVariant::fromValue(protocol)); + } service.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList); if (uuidFilter.isEmpty()) @@ -657,7 +666,16 @@ void QBluetoothServiceDiscoveryAgentPrivate::performMinimalServiceDiscovery(cons } QBluetoothServiceInfo::Sequence protocolDescriptorList; - protocolDescriptorList << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::L2cap)); + { + QBluetoothServiceInfo::Sequence protocol; + protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::L2cap)); + protocolDescriptorList.append(QVariant::fromValue(protocol)); + } + { + QBluetoothServiceInfo::Sequence protocol; + protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Att)); + protocolDescriptorList.append(QVariant::fromValue(protocol)); + } serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList); //don't include the service if we already discovered it before |