diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:04:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:04:09 +0200 |
| commit | 138bc20895c5f843245b5311a2b90f6ab0054251 (patch) | |
| tree | d248769541fb635d4e465a88b164a3a460bea4b0 /src/android/bluetooth/src/org/qtproject | |
| parent | 1a32211d8df7b0f06c75707b1bec029f48789d16 (diff) | |
| parent | c273b642ff142e4d567a62c558e9564d6d8defa4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I044611763bf3912c99b2568de5146f112c4ac2ad
Diffstat (limited to 'src/android/bluetooth/src/org/qtproject')
| -rw-r--r-- | src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 11 |
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; |