Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I3ea075969f9a9b8e94a34b3c7cd92aaea72175af

1 files changed, 10 insertions, 4 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
index 63601058..d1e6b4e4 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
@@ -393,10 +393,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::populateDiscoveredServices(const QB
             serviceInfo.setServiceUuid(uuids.at(i));
         }
 
-        //Check if the UUID is in the uuidFilter
-        if (!uuidFilter.isEmpty() && !uuidFilter.contains(serviceInfo.serviceUuid()))
-            continue;
-
         serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList);
         serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList,
                                  QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
@@ -411,6 +407,16 @@ void QBluetoothServiceDiscoveryAgentPrivate::populateDiscoveredServices(const QB
             serviceInfo.setServiceName(QBluetoothUuid::serviceClassToString(clsId));
         }
 
+        //Check if the service is in the uuidFilter
+        if (!uuidFilter.isEmpty()) {
+            bool match = uuidFilter.contains(serviceInfo.serviceUuid());
+            for (const auto &uuid : qAsConst(uuidFilter))
+                match |= serviceInfo.serviceClassUuids().contains(uuid);
+
+            if (!match)
+                continue;
+        }
+
         //don't include the service if we already discovered it before
         if (!isDuplicatedService(serviceInfo)) {
             discoveredServices << serviceInfo;