Use QAndroidJniExceptionCleaner instead of QAndroidJniEnvironment

Change-Id: I357091799f04a3ef1c8df78960eb63a46e2b3d6c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 4 insertions, 11 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_android.cpp b/src/bluetooth/qbluetoothlocaldevice_android.cpp
index b46923eb..40e4c2d4 100644
--- a/src/bluetooth/qbluetoothlocaldevice_android.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_android.cpp
@@ -90,23 +90,16 @@ static QAndroidJniObject getDefaultAdapter()
     QAndroidJniObject adapter = QAndroidJniObject::callStaticObjectMethod(
                                     "android/bluetooth/BluetoothAdapter", "getDefaultAdapter",
                                     "()Landroid/bluetooth/BluetoothAdapter;");
+    QAndroidJniExceptionCleaner exCleaner{QAndroidJniExceptionCleaner::OutputMode::Verbose};
     if (!adapter.isValid()) {
-        QAndroidJniEnvironment env;
-        if (env->ExceptionCheck()) {
-            env->ExceptionDescribe();
-            env->ExceptionClear();
-        }
+        exCleaner.clean();
 
         // workaround stupid bt implementations where first call of BluetoothAdapter.getDefaultAdapter() always fails
         adapter = QAndroidJniObject::callStaticObjectMethod(
                                             "android/bluetooth/BluetoothAdapter", "getDefaultAdapter",
                                             "()Landroid/bluetooth/BluetoothAdapter;");
-        if (!adapter.isValid()) {
-            if (env->ExceptionCheck()) {
-                env->ExceptionDescribe();
-                env->ExceptionClear();
-            }
-        }
+        if (!adapter.isValid())
+            exCleaner.clean();
     }
     return adapter;
 }