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

AndroidManager: Rename runAdbCommandDetached() into startAdbProcess()

Browse Source 
The process wasn't started detached in fact.

Change-Id: I60aee6d4de3be2499727ea43c3492c1c478f5e94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-08-08 22:34:06 +02:00
parent b01fcf5e7a
commit b8acef5d8c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidmanager.cpp
View File

@@ -612,7 +612,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP
QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber);
arguments << "install" << "-r " << packagePath.path(); arguments << "install" << "-r " << packagePath.path();
QString error; QString error;
QProcess *process = runAdbCommandDetached(arguments, &error); QProcess *process = startAdbProcess(arguments, &error);
if (process) { if (process) {
// TODO: Potential leak when the process is still running on Creator shutdown. // TODO: Potential leak when the process is still running on Creator shutdown.
QObject::connect(process, &QProcess::finished, process, &QObject::deleteLater); QObject::connect(process, &QProcess::finished, process, &QObject::deleteLater);
@@ -671,7 +671,7 @@ bool AndroidManager::checkCertificateExists(const FilePath &keystorePath,
return proc.result() == ProcessResult::FinishedWithSuccess; return proc.result() == ProcessResult::FinishedWithSuccess;
} }
QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString *err) QProcess *AndroidManager::startAdbProcess(const QStringList &args, QString *err)
{ {
std::unique_ptr<QProcess> p(new QProcess); std::unique_ptr<QProcess> p(new QProcess);
const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath(); const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath();

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

@@ -97,7 +97,7 @@ public:
static bool checkCertificateExists(const Utils::FilePath &keystorePath, static bool checkCertificateExists(const Utils::FilePath &keystorePath,
const QString &keystorePasswd, const QString &alias); const QString &keystorePasswd, const QString &alias);
static QProcess *runAdbCommandDetached(const QStringList &args, QString *err = nullptr); static QProcess *startAdbProcess(const QStringList &args, QString *err = nullptr);
static SdkToolResult runAdbCommand(const QStringList &args, const QByteArray &writeData = {}, static SdkToolResult runAdbCommand(const QStringList &args, const QByteArray &writeData = {},
int timeoutS = 30); int timeoutS = 30);

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

@@ -674,7 +674,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
<< "platform" << "platform"
// << "--server" // Can lead to zombie servers // << "--server" // Can lead to zombie servers
<< "--listen" << QString("*:%1").arg(m_localDebugServerPort.toString()); << "--listen" << QString("*:%1").arg(m_localDebugServerPort.toString());
m_debugServerProcess.reset(AndroidManager::runAdbCommandDetached(lldbServerArgs, &lldbServerErr)); m_debugServerProcess.reset(AndroidManager::startAdbProcess(lldbServerArgs, &lldbServerErr));
if (!m_debugServerProcess) { if (!m_debugServerProcess) {
qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << lldbServerErr; qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << lldbServerErr;
@@ -694,7 +694,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
gdbServerErr += adbArgs; gdbServerErr += adbArgs;
gdbServerErr << debugServerFile gdbServerErr << debugServerFile
<< "--multi" << "+" + gdbServerSocket; << "--multi" << "+" + gdbServerSocket;
m_debugServerProcess.reset(AndroidManager::runAdbCommandDetached(gdbServerErr, &gdbProcessErr)); m_debugServerProcess.reset(AndroidManager::startAdbProcess(gdbServerErr, &gdbProcessErr));
if (!m_debugServerProcess) { if (!m_debugServerProcess) {
qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << gdbServerErr; qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << gdbServerErr;
@@ -861,7 +861,7 @@ void AndroidRunnerWorker::onProcessIdChanged(PidUserPair pidUser)
logcatReadStandardOutput(); logcatReadStandardOutput();
QTC_ASSERT(!m_psIsAlive, /**/); QTC_ASSERT(!m_psIsAlive, /**/);
QStringList isAliveArgs = selector() << "shell" << pidPollingScript.arg(m_processPID); QStringList isAliveArgs = selector() << "shell" << pidPollingScript.arg(m_processPID);
m_psIsAlive.reset(AndroidManager::runAdbCommandDetached(isAliveArgs)); m_psIsAlive.reset(AndroidManager::startAdbProcess(isAliveArgs));
QTC_ASSERT(m_psIsAlive, return); QTC_ASSERT(m_psIsAlive, return);
m_psIsAlive->setObjectName("IsAliveProcess"); m_psIsAlive->setObjectName("IsAliveProcess");
m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels); m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels);