diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-05-05 11:42:06 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-05-12 09:06:30 +0300 |
| commit | bb419a4c608b94ff311e1609306f5f0fbc59d3cf (patch) | |
| tree | a735ca36c76a40809e3d51c5185dbae967cc275e /tests | |
| parent | ec04d3db1d095ddbe0e0c98d2d4becb23cccadb3 (diff) | |
Remove unsupported Android bluetooth codepaths
Minimum Android level supported on Qt 6 is Android 6 / API Level 23.
This commit removes older unsupported code in order to simplify.
This concerns primarily:
- sdkVersion() checks
- Java reflections (API availability was uncertain)
Task-number: QTBUG-102497
Pick-to: 6.2 6.3
Change-Id: Ia90248a0a8f8e32130b8394998c2676c97a02eb5
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 2cb74e13..53634a78 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -315,8 +315,8 @@ void BtLocalDevice::serviceDiscovered(const QBluetoothServiceInfo &info) bool matchingService = (info.serviceUuid() == QBluetoothUuid(QString(TEST_SERVICE_UUID))); #ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 23) //bug introduced by Android 6.0.1 - matchingService = matchingService + // QTBUG-61392 + matchingService = matchingService || (info.serviceUuid() == QBluetoothUuid(QString(TEST_REVERSE_SERVICE_UUID))); #endif |