From 47018e59d2b3adbcf47d66b6dda2cbeb9df0b26d Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Thu, 7 Mar 2024 17:06:14 +0100
Subject: [PATCH] Android: revert to using 'threads' in handleJdbSettled

But this time ignore unhandled exceptions which were caused by the
'threads' command in certain situations.

Amends db307978bfd4a037a91341e066d63dcde3de71d6

Change-Id: I50819306eeb392ebae8dc869694ed588739c44fb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidrunnerworker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 8f114f28dbc..3f8ff433b78 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -782,7 +782,7 @@ void AndroidRunnerWorker::handleJdbSettled()
         return false;
     };
 
-    const QStringList commands{"suspend", "resume", "cont", "exit"};
+    const QStringList commands{"ignore uncaught java.lang.Throwable", "threads", "cont", "exit"};
 
     for (const QString &command : commands) {
         if (waitForCommand()) {