diff options
| author | Robin Burchell <robin.burchell@viroteck.net> | 2015-08-20 08:56:24 +0000 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@viroteck.net> | 2015-09-15 20:12:21 +0000 |
| commit | aa6cc482b09bf06d9baaaca1a02d600f8203c2a4 (patch) | |
| tree | 8c9f10e641375a54629476f205ab5fdd93cb9e50 /src/bluetooth/qbluetoothservicediscoveryagent.h | |
| parent | e9995b1199f8e488703a82cd7dfaffed9ad51087 (diff) | |
bluez: SDP: find a device before creating it.
To enable service discovery for known devices even if
org.bluez.Adapter.CreateDevice has security restrictions, call
org.bluez.Adapter.FindDevice first and CreateDevice only if the device
isn't already known.
The change is needed due to runtime security checks on Jolla devices,
but reordering the calls does no harm when used with upstream
bluetoothd.
Change-Id: I8ad09808cec648f5b5949044c60173ff1ad46332
Task-number: MER#1225
Done-by: Hannu Mallat <hannu.mallat@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.h')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index cf756504..984a4084 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -114,6 +114,7 @@ private: #ifdef QT_BLUEZ_BLUETOOTH Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*)) Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*)) + Q_PRIVATE_SLOT(d_func(), void _q_foundDevice(QDBusPendingCallWatcher*)) Q_PRIVATE_SLOT(d_func(), void _q_sdpScannerDone(int,QProcess::ExitStatus)) #endif #ifdef QT_ANDROID_BLUETOOTH |