diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-22 03:03:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-22 03:03:35 +0200 |
| commit | f3b92499474b2ff3a8c55889fc8c045f7a45b592 (patch) | |
| tree | 8ba4244876b2cbece65dc8429a1c260235aad927 /src/bluetooth | |
| parent | c273b642ff142e4d567a62c558e9564d6d8defa4 (diff) | |
| parent | a22807beee00050ebf04f069cdf0ea4ab40ebbf9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ic9af5cb329f2fe15b74c76fc33c2beaaa5de4993
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index 2f0524d4..d8cc5ace 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -150,10 +150,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent } // check Android v23+ permissions - // -> BTLE search requires android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION - if (requestedMethods & QBluetoothDeviceDiscoveryAgent::LowEnergyMethod - && QtAndroid::androidSdkVersion() >= 23) - { + // -> any device search requires android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION + if (QtAndroid::androidSdkVersion() >= 23) { const QString coarsePermission(QLatin1String("android.permission.ACCESS_COARSE_LOCATION")); const QString finePermission(QLatin1String("android.permission.ACCESS_FINE_LOCATION")); |