diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:32:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:32:11 +0100 |
| commit | 78c593fcdd9cdfa5804404f2120768544c01c7f5 (patch) | |
| tree | 9c2849237b596776ad2ae90c24b81a64374e8b78 /src/android | |
| parent | 7fc5deb0f1b40305628f286bb8e25ff198be333f (diff) | |
| parent | 643999d60d3f76e3d24b1c2dca80533a0a0cdb52 (diff) | |
Merge 5.8 into 5.8.0
Change-Id: I1352bca5d8b8afee5e7c06fdb1172e5f3f9678b6
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 faf45621..481f2917 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 @@ -115,11 +115,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 */ |