diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-09-12 11:55:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:38:07 +0200 |
| commit | e264054ca41876bfc954ecb95caaa9e0b9b9dbcd (patch) | |
| tree | f70f9d0f4fae4ee369a892f71a6f323c1113cfc3 /src/bluetooth/qlowenergycontroller_android.cpp | |
| parent | 2c6dcc643f29c212fca0ead123a377e96b9a17c9 (diff) | |
| parent | 9ebd29eafed687ae19ec02aa0bd566f60377ceec (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_android.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index 35d943fc..86e6ade7 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -940,7 +940,7 @@ static QAndroidJniObject createJavaAdvertiseData(const QLowEnergyAdvertisingData env->SetByteArrayRegion(nativeData, 0, nativeSize, reinterpret_cast<const jbyte*>(data.manufacturerData().constData())); builder = builder.callObjectMethod("addManufacturerData", - "(I[B])Landroid/bluetooth/le/AdvertiseData$Builder;", + "(I[B)Landroid/bluetooth/le/AdvertiseData$Builder;", data.manufacturerId(), nativeData); env->DeleteLocalRef(nativeData); |