diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-22 08:54:24 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-22 09:05:14 +0100 |
| commit | a3e2b199366c7a8f71842369cf266107a3b38490 (patch) | |
| tree | a89232fd7999d7625c59b29c2fbc3e9527559539 /src/bluetooth/qlowenergycontroller_android.cpp | |
| parent | 60e8e3bfbcd584b49f81ad5b265930cdac0a0628 (diff) | |
| parent | 69b60f0f92c6d92e619d20caa98cdfb20766821d (diff) | |
Merge remote-tracking branch 'gerrit/dev' into neard
Change-Id: I48826b6a83d8876b97095387cd329165a534eec2
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_android.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index 983c17d9..1ad57a8f 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -263,7 +263,7 @@ void QLowEnergyControllerPrivate::readCharacteristic( } if (!result) - service->setError(QLowEnergyService::CharacteristicWriteError); + service->setError(QLowEnergyService::CharacteristicReadError); } void QLowEnergyControllerPrivate::readDescriptor( @@ -289,7 +289,7 @@ void QLowEnergyControllerPrivate::readDescriptor( } if (!result) - service->setError(QLowEnergyService::DescriptorWriteError); + service->setError(QLowEnergyService::DescriptorReadError); } void QLowEnergyControllerPrivate::connectionUpdated( |