Android: Keep track of peripheral advertisement errors

If advertisement fails then we drop back into the unconnected state
and provide a more detailed error message for individual advertisement
errors.

Change-Id: Ic9de02b456409cd1a2dec11e53c884fe368ae267
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 18 insertions, 0 deletions

diff --git a/src/bluetooth/android/jni_android.cpp b/src/bluetooth/android/jni_android.cpp
index 3cec0c64..e63854bd 100644
--- a/src/bluetooth/android/jni_android.cpp
+++ b/src/bluetooth/android/jni_android.cpp
@@ -230,6 +230,8 @@ static JNINativeMethod methods_le[] = {
 static JNINativeMethod methods_leServer[] = {
     {"leServerConnectionStateChange", "(JII)V",
                 (void *) LowEnergyNotificationHub::lowEnergy_connectionChange},
+    {"leServerAdvertisementError", "(JI)V",
+                (void *) LowEnergyNotificationHub::lowEnergy_advertisementError},
 };
 
 static JNINativeMethod methods_server[] = {
diff --git a/src/bluetooth/android/lowenergynotificationhub.cpp b/src/bluetooth/android/lowenergynotificationhub.cpp
index 219124fa..d6e0a4f1 100644
--- a/src/bluetooth/android/lowenergynotificationhub.cpp
+++ b/src/bluetooth/android/lowenergynotificationhub.cpp
@@ -309,4 +309,17 @@ void LowEnergyNotificationHub::lowEnergy_serviceError(
                                     (QLowEnergyService::ServiceError)errorCode));
 }
 
+void LowEnergyNotificationHub::lowEnergy_advertisementError(
+        JNIEnv *, jobject, jlong qtObject, jint status)
+{
+    lock.lockForRead();
+    LowEnergyNotificationHub *hub = hubMap()->value(qtObject);
+    lock.unlock();
+    if (!hub)
+        return;
+
+    QMetaObject::invokeMethod(hub, "advertisementError", Qt::QueuedConnection,
+                              Q_ARG(int, status));
+}
+
 QT_END_NAMESPACE
diff --git a/src/bluetooth/android/lowenergynotificationhub_p.h b/src/bluetooth/android/lowenergynotificationhub_p.h
index cfee78e4..4efbd6de 100644
--- a/src/bluetooth/android/lowenergynotificationhub_p.h
+++ b/src/bluetooth/android/lowenergynotificationhub_p.h
@@ -95,6 +95,8 @@ public:
                                                 jint charHandle, jbyteArray data);
     static void lowEnergy_serviceError(JNIEnv *, jobject, jlong qtObject,
                                        jint attributeHandle, int errorCode);
+    static void lowEnergy_advertisementError(JNIEnv *, jobject, jlong qtObject,
+                                               jint status);
 
     QAndroidJniObject javaObject()
     {
@@ -118,6 +120,7 @@ signals:
                            QLowEnergyService::ServiceError errorCode);
     void characteristicChanged(int charHandle, const QByteArray &data);
     void serviceError(int attributeHandle, QLowEnergyService::ServiceError errorCode);
+    void advertisementError(int status);
 
 public slots:
 private: