Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2

Change-Id: Ieeeab88ca3afd1fb42aafb9e05bf426caec065ef

1 files changed, 5 insertions, 1 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
index ddc53421..e607a27e 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
@@ -47,6 +47,7 @@
 #include <QtBluetooth/QBluetoothServiceDiscoveryAgent>
 
 #include "qbluetoothservicediscoveryagent_p.h"
+#include "qbluetoothsocket_android_p.h"
 #include "android/servicediscoverybroadcastreceiver_p.h"
 #include "android/localdevicebroadcastreceiver_p.h"
 
@@ -449,8 +450,11 @@ void QBluetoothServiceDiscoveryAgentPrivate::populateDiscoveredServices(const QB
         //Check if the service is in the uuidFilter
         if (!uuidFilter.isEmpty()) {
             bool match = uuidFilter.contains(serviceInfo.serviceUuid());
-            for (const auto &uuid : qAsConst(uuidFilter))
+            match |= uuidFilter.contains(QBluetoothSocketPrivateAndroid::reverseUuid(serviceInfo.serviceUuid()));
+            for (const auto &uuid : qAsConst(uuidFilter)) {
                 match |= serviceInfo.serviceClassUuids().contains(uuid);
+                match |= serviceInfo.serviceClassUuids().contains(QBluetoothSocketPrivateAndroid::reverseUuid(uuid));
+            }
 
             if (!match)
                 continue;