From a61ee48bc16fae61cabb9a242f3a7c19caa4cbfd Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 20 Feb 2018 14:37:49 +0300 Subject: LE/Android: add consistency check in method called from Qt API Call to includedServices() from Qt side after unexpected disconnection leads to NullPointerException due to unchecked member access. Fix that! Change-Id: Iae89801d7af86d5a3f34ebba9eb2ea12da252cd2 Reviewed-by: Alex Blasche --- .../src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') 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 dc48514a..6c548f84 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 @@ -839,6 +839,9 @@ public class QtBluetoothLE { */ public String includedServices(String serviceUuid) { + if (mBluetoothGatt == null) + return null; + UUID uuid; try { uuid = UUID.fromString(serviceUuid); -- cgit v1.2.3