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

Android: Inline AndroidRunnerWorker::adbKill()

Browse Source 
Change-Id: I2c4fefac4f18b65fe73619cc70090133eb4dbbf5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-14 11:44:31 +02:00
parent aac42d6292
commit 5453d13290
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,12 +367,6 @@ bool AndroidRunnerWorker::packageFileExists(const QString &filePath)
return success && !output.trimmed().isEmpty();
}
void AndroidRunnerWorker::adbKill(qint64 pid)
{
if (!runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)}))
runAdb({"shell", "kill", "-9", QString::number(pid)});
}
QStringList AndroidRunnerWorker::selector() const
{
return AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);
@@ -385,8 +379,11 @@ void AndroidRunnerWorker::forceStop()
// try killing it via kill -9
QString output;
runAdb({"shell", "pidof", m_packageName}, &output);
if (m_processPID != -1 && output == QString::number(m_processPID))
adbKill(m_processPID);
const QString pidString = QString::number(m_processPID);
if (m_processPID != -1 && output == pidString
&& !runAdb({"shell", "run-as", m_packageName, "kill", "-9", pidString})) {
runAdb({"shell", "kill", "-9", pidString});
}
}
void AndroidRunnerWorker::logcatReadStandardError()

1
src/plugins/android/androidrunnerworker.h
View File

@@ -51,7 +51,6 @@ signals:
private:
bool runAdb(const QStringList &args, QString *stdOut = nullptr, QString *stdErr = nullptr,
const QByteArray &writeData = {});
void adbKill(qint64 pid);
QStringList selector() const;
void forceStop();
void logcatReadStandardError();