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

Android: Get rid of forceStop()

Browse Source 
Use forceStopRecipe() instead.

Change-Id: I7044be98c6d8099e2b22274431ed5be1a4050e23
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-08-14 14:19:12 +02:00
parent 8050b48c32
commit ccd0e7a88f
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,19 +216,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner)
AndroidRunnerWorker::~AndroidRunnerWorker()
{
if (m_processPID != -1)
forceStop();
}
bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *stdOut, QString *stdErr)
{
const SdkToolResult result = AndroidManager::runAdbCommand(selector() + args);
if (!result.success())
emit remoteErrorOutput(result.stdErr());
if (stdOut)
*stdOut = result.stdOut();
if (stdErr)
*stdErr = result.stdErr();
return result.success();
TaskTree::runBlocking(Group { forceStopRecipe(), postDoneRecipe() });
}
QStringList AndroidRunnerWorker::selector() const
@@ -236,20 +224,6 @@ QStringList AndroidRunnerWorker::selector() const
return AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);
}
void AndroidRunnerWorker::forceStop()
{
runAdb({"shell", "am", "force-stop", m_packageName});
// try killing it via kill -9
QString output;
runAdb({"shell", "pidof", m_packageName}, &output);
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::setAndroidDeviceInfo(const AndroidDeviceInfo &info)
{
m_deviceSerialNumber = info.serialNumber;

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

@@ -36,9 +36,7 @@ signals:
void remoteErrorOutput(const QString &output);
private:
bool runAdb(const QStringList &args, QString *stdOut = nullptr, QString *stdErr = nullptr);
QStringList selector() const;
void forceStop();
bool isPreNougat() const { return m_apiLevel > 0 && m_apiLevel <= 23; }