From 41c697a67ba756b901b995b007283cf910149b44 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 30 Jun 2020 16:09:10 +0300 Subject: [PATCH] Android: silence adb irrelevant SynchronousProcess error outputs Task-number: QTCREATORBUG-24155 Change-Id: Ibebc48d471ef7aeec37c99eda5c27d5419c913f3 Reviewed-by: Alessandro Portale --- src/plugins/android/androidrunnerworker.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 9b1b067f76f..9b1c4485809 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -331,7 +331,7 @@ bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *stdOut, QStringList adbArgs = selector() + args; SdkToolResult result = AndroidManager::runAdbCommand(adbArgs, writeData); if (!result.success()) - emit remoteErrorOutput(result.exitMessage() + "\n" + result.stdErr()); + emit remoteErrorOutput(result.stdErr()); if (stdOut) *stdOut = result.stdOut(); return result.success(); @@ -391,8 +391,8 @@ bool AndroidRunnerWorker::packageFileExists(const QString &filePath) void AndroidRunnerWorker::adbKill(qint64 pid) { - runAdb({"shell", "kill", "-9", QString::number(pid)}); - runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)}); + if (!runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)})) + runAdb({"shell", "kill", "-9", QString::number(pid)}); } QStringList AndroidRunnerWorker::selector() const @@ -405,7 +405,9 @@ void AndroidRunnerWorker::forceStop() runAdb({"shell", "am", "force-stop", m_packageName}); // try killing it via kill -9 - if (m_processPID != -1) + QString output; + runAdb({"shell", "pidof", m_packageName}, &output); + if (m_processPID != -1 && output == QString::number(m_processPID)) adbKill(m_processPID); }