diff options
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_android.cpp')
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_android.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp index 48b09eff..5b9d1965 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp @@ -86,13 +86,6 @@ QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate( } } - if (QNativeInterface::QAndroidApplication::sdkVersion() < 15) - qCWarning(QT_BT_ANDROID) - << "SDP not supported by Android API below version 15. Detected version: " - << QNativeInterface::QAndroidApplication::sdkVersion() - << "Service discovery will return empty list."; - - /* We assume that the current local adapter has been passed. The logic below must change once there is more than one adapter. @@ -152,29 +145,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr return; } - /* SDP discovery was officially added by Android API v15 - * BluetoothDevice.getUuids() existed in earlier APIs already and in the future we may use - * reflection to support earlier Android versions than 15. Unfortunately - * BluetoothDevice.fetchUuidsWithSdp() and related APIs had some structure changes - * over time. Therefore we won't attempt this with reflection. - * - * TODO: Use reflection to support getUuuids() where possible. - * */ - if (QNativeInterface::QAndroidApplication::sdkVersion() < 15) { - qCWarning(QT_BT_ANDROID) << "Aborting SDP enquiry due to too low Android API version (requires v15+)"; - - error = QBluetoothServiceDiscoveryAgent::UnknownError; - errorString = QBluetoothServiceDiscoveryAgent::tr("Android API below v15 does not support SDP discovery"); - - //abort any outstanding discoveries - sdpCache.clear(); - discoveredDevices.clear(); - emit q->errorOccurred(error); - _q_serviceDiscoveryFinished(); - - return; - } - QJniObject inputString = QJniObject::fromString(address.toString()); QJniObject remoteDevice = btAdapter.callObjectMethod("getRemoteDevice", |