summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-14 03:03:42 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-14 03:03:42 +0100
commit39513dcdac9b3e55c62c53431cadde11a0336abb (patch)
treef55c454ca3b7653c7d4765a81cffa1ac6caf89a6 /src
parent7d653dea516ed8e756814532dc4be742f5e0ce78 (diff)
parentf5b586bbbe37cfb4806c93b39a3483d0160daf0f (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src')
-rw-r--r--src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLEServer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLEServer.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLEServer.java
index cdd16686..9ef254f5 100644
--- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLEServer.java
+++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLEServer.java
@@ -237,6 +237,7 @@ public class QtBluetoothLEServer {
qtControllerState = 0; // QLowEnergyController::UnconnectedState
clientCharacteristicManager.markDeviceConnectivity(device, false);
mGattServer.close();
+ mGattServer = null;
break;
case BluetoothProfile.STATE_CONNECTED:
clientCharacteristicManager.markDeviceConnectivity(device, true);
@@ -461,7 +462,8 @@ public class QtBluetoothLEServer {
return;
}
- mGattServer.addService(service);
+ boolean success = mGattServer.addService(service);
+ Log.w(TAG, "Services successfully added: " + success);
}
/*