diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:02:28 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:02:28 +0100 |
| commit | 79702f744e4906155736967dea1af5433355c71a (patch) | |
| tree | 9dedf9dfeb25f1ef49f6c4480ee7d2ee6c6618ec /src/android/bluetooth/src | |
| parent | d740076c78252de049beb56b553c8d297af2ac1e (diff) | |
| parent | a2769b323dc890def9dffaf98c768cec12eba3c0 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Change-Id: Iea61654bd94c9bb4be0736a5d5512fb42d845488
Diffstat (limited to 'src/android/bluetooth/src')
| -rw-r--r-- | src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java index 8a69b4c7..f70ee8a4 100644 --- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java +++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java @@ -162,7 +162,13 @@ public class QtBluetoothLE { mBluetoothLeScanner.startScan(filterList, settings, leScanCallback21); mLeScanRunning = true; } else { - mBluetoothLeScanner.stopScan(leScanCallback21); + try { + mBluetoothLeScanner.stopScan(leScanCallback21); + } catch (IllegalStateException isex) { + // when trying to stop a scan while bluetooth is offline + // java.lang.IllegalStateException: BT Adapter is not turned ON + Log.d(TAG, "Stopping LE scan not possible: " + isex.getMessage()); + } mLeScanRunning = false; } |