feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: silence adb irrelevant SynchronousProcess error outputs

Browse Source 
Task-number: QTCREATORBUG-24155
Change-Id: Ibebc48d471ef7aeec37c99eda5c27d5419c913f3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-30 16:09:10 +03:00
parent 697a7ad6db
commit 41c697a67b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidrunnerworker.cpp
View File

@@ -331,7 +331,7 @@ bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *stdOut,
QStringList adbArgs = selector() + args; QStringList adbArgs = selector() + args;
SdkToolResult result = AndroidManager::runAdbCommand(adbArgs, writeData); SdkToolResult result = AndroidManager::runAdbCommand(adbArgs, writeData);
if (!result.success()) if (!result.success())
emit remoteErrorOutput(result.exitMessage() + "\n" + result.stdErr()); emit remoteErrorOutput(result.stdErr());
if (stdOut) if (stdOut)
*stdOut = result.stdOut(); *stdOut = result.stdOut();
return result.success(); return result.success();
@@ -391,8 +391,8 @@ bool AndroidRunnerWorker::packageFileExists(const QString &filePath)
void AndroidRunnerWorker::adbKill(qint64 pid) void AndroidRunnerWorker::adbKill(qint64 pid)
{ {
runAdb({"shell", "kill", "-9", QString::number(pid)}); if (!runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)}))
runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)}); runAdb({"shell", "kill", "-9", QString::number(pid)});
} }
QStringList AndroidRunnerWorker::selector() const QStringList AndroidRunnerWorker::selector() const
@@ -405,7 +405,9 @@ void AndroidRunnerWorker::forceStop()
runAdb({"shell", "am", "force-stop", m_packageName}); runAdb({"shell", "am", "force-stop", m_packageName});
// try killing it via kill -9 // 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); adbKill(m_processPID);
} }