diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-01-12 08:52:36 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-01-12 15:24:45 +0000 |
| commit | 1b86d493e016efbe6b4de99d7fdffabb9b31f25b (patch) | |
| tree | fbd4582098d90240afdbc3ebc1392c8720b00c41 | |
| parent | e0571b53b49facba595c353e3f361ad9bb96b983 (diff) | |
Android: Fix incorrect device search type bit flag test
We are testing bit flags and don't require a logical AND.
[ChangeLog][QtBluetooth][Android] Fixed incorrect bit flag test. This
caused QBluetoothDeviceDiscoveryAgent to always request Location
permissions even when only a classic device search is needed.
Change-Id: I6d6bd63da9a002bcec430e1ce90d0f13d153fe9c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index 9ceee2bc..e76ddff7 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -148,7 +148,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent // check Android v23+ permissions // -> BTLE search requires android.permission.ACCESS_COARSE_LOCATION - if (requestedMethods && QBluetoothDeviceDiscoveryAgent::LowEnergyMethod && QtAndroid::androidSdkVersion() >= 23) { + if (requestedMethods & QBluetoothDeviceDiscoveryAgent::LowEnergyMethod + && QtAndroid::androidSdkVersion() >= 23) + { QString permission(QLatin1String("android.permission.ACCESS_COARSE_LOCATION")); // do we have required permission already, if so nothing to do |