Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2

 Conflicts:
	src/bluetooth/doc/src/bluetooth-index.qdoc

Change-Id: If353b4ac63c72d6f94415e1349a206ade4ceb52e

1 files changed, 9 insertions, 2 deletions

diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
index c6ffbbf4..8a69b4c7 100644
--- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
+++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
@@ -431,8 +431,15 @@ public class QtBluetoothLE {
                         descriptor.getUuid().toString(), descriptor.getValue());
             } else {
                 if (isServiceDiscoveryRun) {
-                    //ignore
-                    Log.w(TAG, "onDescriptorcRead during discovery error: " + status);
+                    // Cannot read but still advertise the fact that we found a descriptor
+                    // The value will be empty.
+                    Log.w(TAG, "onDescriptorRead during discovery error: " + status);
+                    Log.d(TAG, "Non-readable descriptor " + descriptor.getUuid() +
+                          " for characteristic "  + descriptor.getCharacteristic().getUuid() +
+                          " for service " + descriptor.getCharacteristic().getService().getUuid());
+                    leDescriptorRead(qtObject, descriptor.getCharacteristic().getService().getUuid().toString(),
+                        descriptor.getCharacteristic().getUuid().toString(), foundHandle + 1,
+                        descriptor.getUuid().toString(), descriptor.getValue());
                 } else {
                     // This must be in sync with QLowEnergyService::DescriptorReadError
                     final int descriptorReadError = 6;