diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-10 03:01:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-10 03:01:35 +0200 |
| commit | 5b1f1adc6be45e4a42ffea9f2ccc823c7f18b308 (patch) | |
| tree | c6620d6909400ecd6e80ee3e0aa908d61ddd168f | |
| parent | 96dd4e7ff0b10ac79798f1ae63db716bcc199e87 (diff) | |
| parent | 406b18fdb3704a9e9e66cefbc74e7cff55f1947c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4cf492d5c7afde6b871ec4dc9198e9a794320e32
| -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); |