Android: Fix read/write error reports when failure during initial call

The BluetoothGatt.[read|write][Characteristic|Descriptor]() functions
may immediately return under certain circumstances such as writing a
read-only characteristic. So far, this "synchronous" form of error
reporting was not handled.

Any read error during the initial service dioscovery and its related
cache population continues to surpress any read errors.

Change-Id: I4987f67f4a0d2afe58cd144a577a19e0f0d43b33
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp
index 992427ff..f48c0e85 100644
--- a/src/bluetooth/qlowenergycontroller_android.cpp
+++ b/src/bluetooth/qlowenergycontroller_android.cpp
@@ -80,6 +80,8 @@ void QLowEnergyControllerPrivate::connectToDevice()
                 this, &QLowEnergyControllerPrivate::descriptorWritten);
         connect(hub, &LowEnergyNotificationHub::characteristicChanged,
                 this, &QLowEnergyControllerPrivate::characteristicChanged);
+        connect(hub, &LowEnergyNotificationHub::serviceError,
+                this, &QLowEnergyControllerPrivate::serviceError);
     }
 
     if (!hub->javaObject().isValid()) {
@@ -563,6 +565,10 @@ void QLowEnergyControllerPrivate::characteristicChanged(
 void QLowEnergyControllerPrivate::serviceError(
         int attributeHandle, QLowEnergyService::ServiceError errorCode)
 {
+    // ignore call if it isn't really an error
+    if (errorCode == QLowEnergyService::NoError)
+        return;
+
     QSharedPointer<QLowEnergyServicePrivate> service =
             serviceForHandle(attributeHandle);
     Q_ASSERT(!service.isNull());