summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-10-20 08:39:04 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-10-28 13:59:43 +0100
commit04cb0d4af57cecdb6e47a6e2235083035580fa0d (patch)
treebcf62e2329f5aad1346f00b53e77c393dcc7961e /src/bluetooth/qbluetoothdevicediscoveryagent_p.h
parenta7b0b599775864743d1436d3cbd9513f92eb2d06 (diff)
Android: Add BluetoothLE device scan
Change-Id: Ibbb1e9f141d494327082aebaf9e34ffe44039115 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_p.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index f25496dc..1e269e1f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -49,6 +49,7 @@
#ifdef QT_ANDROID_BLUETOOTH
#include <QtAndroidExtras/QAndroidJniObject>
#include "android/devicediscoverybroadcastreceiver_p.h"
+#include <QtCore/QTimer>
#endif
#include <QtCore/QVariantMap>
@@ -117,14 +118,20 @@ private:
#ifdef QT_ANDROID_BLUETOOTH
private slots:
- void processDiscoveryFinished();
- void processDiscoveredDevices(const QBluetoothDeviceInfo &info);
+ void processSdpDiscoveryFinished();
+ void processDiscoveredDevices(const QBluetoothDeviceInfo &info, bool isLeResult);
+ friend void QtBluetoothLE_leScanResult(JNIEnv *, jobject, jlong, jobject);
+ void stopLowEnergyScan();
private:
+ void startLowEnergyScan();
+
DeviceDiscoveryBroadcastReceiver *receiver;
QBluetoothAddress m_adapterAddress;
- bool m_active;
+ short m_active;
QAndroidJniObject adapter;
+ QAndroidJniObject leScanner;
+ QTimer *leScanTimeout;
bool pendingCancel, pendingStart;
#elif defined(QT_BLUEZ_BLUETOOTH)