diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:52:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 11:49:13 +0100 |
| commit | 643999d60d3f76e3d24b1c2dca80533a0a0cdb52 (patch) | |
| tree | bd5366cde3979c6339febaf1e98699c684cf2fc9 /src/android | |
| parent | 73e02ede397a03108b8cc0d9a7775448145a0682 (diff) | |
| parent | 042e26bccd2e53447229035c2b31cc1ab853335e (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/bluetooth/osx/osxbtledeviceinquiry.mm
Change-Id: Iefec1aafcb81174b0e1e257246ded08841bf3259
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 4 |
1 files changed, 2 insertions, 2 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 deb70dc0..9fe88e9c 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 @@ -114,11 +114,11 @@ public class QtBluetoothLE { if (qtObject == 0) return; - leScanResult(qtObject, device, rssi); + leScanResult(qtObject, device, rssi, scanRecord); } }; - public native void leScanResult(long qtObject, BluetoothDevice device, int rssi); + public native void leScanResult(long qtObject, BluetoothDevice device, int rssi, byte[] scanRecord); /*************************************************************/ /* Service Discovery */ |