From cd37c6bbc6ad4368bf9f4bc5fb3b8462f2b10cab Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 23 Mar 2015 17:51:35 +0100 Subject: Bluetooth (classic) service discovery - skip LE devices (OS X) LE scan on OS X can find LE devices, but CoreBluetooth does not expose hardware addresses and as a result we can not run (and should not) SDP scan on such devices - just skip them. Change-Id: Iaa5c47e1d317c39918d13830c9c6eeab398bc7a5 Reviewed-by: Alex Blasche --- src/bluetooth/qbluetoothservicediscoveryagent_osx.mm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm index 572e445e..64723dd1 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm @@ -171,6 +171,13 @@ void QBluetoothServiceDiscoveryAgentPrivate::startServiceDiscovery() state = ServiceDiscovery; const QBluetoothAddress &address(discoveredDevices.at(0).address()); + if (address.isNull()) { + // This can happen: LE scan works with CoreBluetooth, but CBPeripherals + // do not expose hardware addresses. + // Pop the current QBluetoothDeviceInfo and decide what to do next. + return serviceDiscoveryFinished(); + } + // Autoreleased object. IOBluetoothHostController *const hc = [IOBluetoothHostController defaultController]; if (![hc powerState]) { -- cgit v1.2.3