Merge remote-tracking branch 'gerrit/5.9' into btle

Change-Id: Ic8a6a7f8bf36b5604ec758e89091a04e60df993a

1 files changed, 8 insertions, 8 deletions

diff --git a/src/bluetooth/qbluetoothsocket_android.cpp b/src/bluetooth/qbluetoothsocket_android.cpp
index ab8cd876..56d4f77b 100644
--- a/src/bluetooth/qbluetoothsocket_android.cpp
+++ b/src/bluetooth/qbluetoothsocket_android.cpp
@@ -252,15 +252,15 @@ bool QBluetoothSocketPrivate::fallBackConnect(QAndroidJniObject uuid, int channe
         if (env->ExceptionCheck()) {
             env->ExceptionDescribe();
             env->ExceptionClear();
-        }
-
-        if (socketChannel
-                == remoteDevice.getStaticField<jint>("android/bluetooth/BluetoothDevice", "ERROR")
-            || socketChannel == -1) {
-            qCWarning(QT_BT_ANDROID) << "Cannot determine RFCOMM service channel.";
         } else {
-            qCWarning(QT_BT_ANDROID) << "Using found rfcomm channel" << socketChannel;
-            channel = socketChannel;
+            if (socketChannel
+                    == remoteDevice.getStaticField<jint>("android/bluetooth/BluetoothDevice", "ERROR")
+                || socketChannel == -1) {
+                qCWarning(QT_BT_ANDROID) << "Cannot determine RFCOMM service channel.";
+            } else {
+                qCWarning(QT_BT_ANDROID) << "Using found rfcomm channel" << socketChannel;
+                channel = socketChannel;
+            }
         }
     }