From d332ce0f202c3a7065901a7f6d7fdd99438e7670 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
Date: Wed, 10 Jun 2015 13:53:24 +0200
Subject: Android: Fix crashing QBluetoothDeviceDiscoveryAgent on Androids <v18

The new BTLE aware device discovery crashes due to a wrong internal
activity state. The device discovery emits finished() signal when
the SDP discovery finishes. It does not continue with BTLE scans
oin Android releases 4.1.x or earlier.
The signal emission causes the classes dtor to run.
In turn the dtor calls stop() because the activity flag
still indicates a running device scan which emits error(), which calls
the classes dtor and the entire loop continues until a stack overflow
is caused.

Task-number: QTBUG-46588
Change-Id: If7e4af6773c6063cee11f59e0b0db477fea0c003
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
---
 src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
index a6aaaf03..f977c471 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
@@ -201,6 +201,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processSdpDiscoveryFinished()
         // start LE scan if supported
         if (QtAndroidPrivate::androidSdkVersion() < 18) {
             qCDebug(QT_BT_ANDROID) << "Skipping Bluetooth Low Energy device scan";
+            m_active = NoScanActive;
             emit q->finished();
         } else {
             startLowEnergyScan();
-- 
cgit v1.2.3