diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 27c38f1ddb8..a9639b0b750 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -612,7 +612,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); arguments << "install" << "-r " << packagePath.path(); QString error; - QProcess *process = runAdbCommandDetached(arguments, &error); + QProcess *process = startAdbProcess(arguments, &error); if (process) { // TODO: Potential leak when the process is still running on Creator shutdown. QObject::connect(process, &QProcess::finished, process, &QObject::deleteLater); @@ -671,7 +671,7 @@ bool AndroidManager::checkCertificateExists(const FilePath &keystorePath, return proc.result() == ProcessResult::FinishedWithSuccess; } -QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString *err) +QProcess *AndroidManager::startAdbProcess(const QStringList &args, QString *err) { std::unique_ptr p(new QProcess); const FilePath adb = AndroidConfigurations::currentConfig().adbToolPath(); diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index fdb0973d9bc..772f3da5dc9 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -97,7 +97,7 @@ public: static bool checkCertificateExists(const Utils::FilePath &keystorePath, 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 = {}, int timeoutS = 30); diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 3be19a69fad..f8dd558b224 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -674,7 +674,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir, << "platform" // << "--server" // Can lead to zombie servers << "--listen" << QString("*:%1").arg(m_localDebugServerPort.toString()); - m_debugServerProcess.reset(AndroidManager::runAdbCommandDetached(lldbServerArgs, &lldbServerErr)); + m_debugServerProcess.reset(AndroidManager::startAdbProcess(lldbServerArgs, &lldbServerErr)); if (!m_debugServerProcess) { qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << lldbServerErr; @@ -694,7 +694,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir, gdbServerErr += adbArgs; gdbServerErr << debugServerFile << "--multi" << "+" + gdbServerSocket; - m_debugServerProcess.reset(AndroidManager::runAdbCommandDetached(gdbServerErr, &gdbProcessErr)); + m_debugServerProcess.reset(AndroidManager::startAdbProcess(gdbServerErr, &gdbProcessErr)); if (!m_debugServerProcess) { qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << gdbServerErr; @@ -861,7 +861,7 @@ void AndroidRunnerWorker::onProcessIdChanged(PidUserPair pidUser) logcatReadStandardOutput(); QTC_ASSERT(!m_psIsAlive, /**/); 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); m_psIsAlive->setObjectName("IsAliveProcess"); m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels);