2017-04-03 11:11:17 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator.
|
|
|
|
|
**
|
|
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
|
|
|
**
|
|
|
|
|
** GNU General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
#include "androidavdmanager.h"
|
|
|
|
|
|
2021-05-06 15:19:56 +02:00
|
|
|
#include "avdmanageroutputparser.h"
|
|
|
|
|
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <coreplugin/icore.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2020-07-23 15:48:56 +02:00
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <utils/algorithm.h>
|
|
|
|
|
#include <utils/qtcassert.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
#include <utils/qtcprocess.h>
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <utils/runextensions.h>
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
#include <QApplication>
|
|
|
|
|
#include <QFileInfo>
|
|
|
|
|
#include <QLoggingCategory>
|
2018-04-18 12:23:02 +02:00
|
|
|
#include <QMessageBox>
|
2017-04-03 11:11:17 +02:00
|
|
|
#include <QSettings>
|
|
|
|
|
|
|
|
|
|
#include <chrono>
|
2018-04-19 09:18:42 +02:00
|
|
|
#include <functional>
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2019-06-06 16:27:55 +02:00
|
|
|
using namespace Utils;
|
|
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
namespace {
|
2020-01-15 14:39:23 +01:00
|
|
|
static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
namespace Android {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
|
|
|
|
|
|
const int avdCreateTimeoutMs = 30000;
|
|
|
|
|
|
|
|
|
|
/*!
|
|
|
|
|
Runs the \c avdmanager tool specific to configuration \a config with arguments \a args. Returns
|
|
|
|
|
\c true if the command is successfully executed. Output is copied into \a output. The function
|
|
|
|
|
blocks the calling thread.
|
|
|
|
|
*/
|
2020-02-10 16:02:24 +02:00
|
|
|
bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
2019-06-06 16:27:55 +02:00
|
|
|
CommandLine cmd(config.avdManagerToolPath(), args);
|
2021-06-22 04:33:47 +02:00
|
|
|
Utils::QtcProcess proc;
|
2021-04-30 17:50:30 +02:00
|
|
|
Environment env = AndroidConfigurations::toolsEnvironment(config);
|
2018-04-19 12:19:03 +02:00
|
|
|
proc.setEnvironment(env);
|
2020-07-01 18:10:02 +03:00
|
|
|
qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
|
2021-05-17 12:02:42 +02:00
|
|
|
proc.setCommand(cmd);
|
|
|
|
|
proc.runBlocking();
|
2021-05-28 13:19:38 +02:00
|
|
|
if (proc.result() == Utils::QtcProcess::FinishedWithSuccess) {
|
2017-04-03 11:11:17 +02:00
|
|
|
if (output)
|
2021-05-12 14:25:50 +02:00
|
|
|
*output = proc.allOutput();
|
2017-04-03 11:11:17 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool checkForTimeout(const chrono::steady_clock::time_point &start,
|
|
|
|
|
int msecs = 3000)
|
|
|
|
|
{
|
|
|
|
|
bool timedOut = false;
|
|
|
|
|
auto end = chrono::steady_clock::now();
|
|
|
|
|
if (chrono::duration_cast<chrono::milliseconds>(end-start).count() > msecs)
|
|
|
|
|
timedOut = true;
|
|
|
|
|
return timedOut;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-10 16:02:24 +02:00
|
|
|
static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateAvdInfo &info)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
2017-08-18 08:22:34 +02:00
|
|
|
CreateAvdInfo result = info;
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
if (!result.isValid()) {
|
|
|
|
|
qCDebug(avdManagerLog) << "AVD Create failed. Invalid CreateAvdInfo" << result.name
|
2020-01-08 14:55:16 +02:00
|
|
|
<< result.systemImage->displayText() << result.systemImage->apiLevel();
|
2017-04-03 11:11:17 +02:00
|
|
|
result.error = QApplication::translate("AndroidAvdManager",
|
|
|
|
|
"Cannot create AVD. Invalid input.");
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-18 10:40:54 +02:00
|
|
|
QStringList arguments({"create", "avd", "-n", result.name});
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2020-01-08 14:55:16 +02:00
|
|
|
arguments << "-k" << result.systemImage->sdkStylePath();
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
if (result.sdcardSize > 0)
|
|
|
|
|
arguments << "-c" << QString::fromLatin1("%1M").arg(result.sdcardSize);
|
|
|
|
|
|
2020-01-08 14:55:16 +02:00
|
|
|
if (!result.deviceDefinition.isEmpty() && result.deviceDefinition != "Custom")
|
|
|
|
|
arguments << "-d" << QString::fromLatin1("%1").arg(result.deviceDefinition);
|
|
|
|
|
|
|
|
|
|
if (result.overwrite)
|
|
|
|
|
arguments << "-f";
|
|
|
|
|
|
2021-08-10 16:19:02 +02:00
|
|
|
const FilePath avdManagerTool = config.avdManagerToolPath();
|
2020-01-13 16:01:56 +01:00
|
|
|
qCDebug(avdManagerLog)
|
2020-07-01 18:10:02 +03:00
|
|
|
<< "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
|
2017-04-03 11:11:17 +02:00
|
|
|
QProcess proc;
|
2021-09-27 23:14:43 +02:00
|
|
|
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config).toStringList());
|
2021-08-10 16:19:02 +02:00
|
|
|
proc.start(avdManagerTool.toString(), arguments);
|
2017-04-03 11:11:17 +02:00
|
|
|
if (!proc.waitForStarted()) {
|
|
|
|
|
result.error = QApplication::translate("AndroidAvdManager",
|
|
|
|
|
"Could not start process \"%1 %2\"")
|
2021-08-10 16:19:02 +02:00
|
|
|
.arg(avdManagerTool.toString(), arguments.join(' '));
|
2017-04-03 11:11:17 +02:00
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
QTC_CHECK(proc.state() == QProcess::Running);
|
|
|
|
|
proc.write(QByteArray("yes\n")); // yes to "Do you wish to create a custom hardware profile"
|
|
|
|
|
|
|
|
|
|
auto start = chrono::steady_clock::now();
|
|
|
|
|
QString errorOutput;
|
|
|
|
|
QByteArray question;
|
|
|
|
|
while (errorOutput.isEmpty()) {
|
|
|
|
|
proc.waitForReadyRead(500);
|
|
|
|
|
question += proc.readAllStandardOutput();
|
|
|
|
|
if (question.endsWith(QByteArray("]:"))) {
|
|
|
|
|
// truncate to last line
|
|
|
|
|
int index = question.lastIndexOf(QByteArray("\n"));
|
|
|
|
|
if (index != -1)
|
|
|
|
|
question = question.mid(index);
|
|
|
|
|
if (question.contains("hw.gpu.enabled"))
|
|
|
|
|
proc.write(QByteArray("yes\n"));
|
|
|
|
|
else
|
|
|
|
|
proc.write(QByteArray("\n"));
|
|
|
|
|
question.clear();
|
|
|
|
|
}
|
|
|
|
|
// The exit code is always 0, so we need to check stderr
|
|
|
|
|
// For now assume that any output at all indicates a error
|
|
|
|
|
errorOutput = QString::fromLocal8Bit(proc.readAllStandardError());
|
|
|
|
|
if (proc.state() != QProcess::Running)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// For a sane input and command, process should finish before timeout.
|
|
|
|
|
if (checkForTimeout(start, avdCreateTimeoutMs)) {
|
|
|
|
|
result.error = QApplication::translate("AndroidAvdManager",
|
|
|
|
|
"Cannot create AVD. Command timed out.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Kill the running process.
|
|
|
|
|
if (proc.state() != QProcess::NotRunning) {
|
|
|
|
|
proc.terminate();
|
|
|
|
|
if (!proc.waitForFinished(3000))
|
|
|
|
|
proc.kill();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QTC_CHECK(proc.state() == QProcess::NotRunning);
|
|
|
|
|
result.error = errorOutput;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-19 09:18:42 +02:00
|
|
|
static void avdProcessFinished(int exitCode, QProcess *p)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(p, return);
|
|
|
|
|
if (exitCode) {
|
|
|
|
|
QString title = QCoreApplication::translate("Android::Internal::AndroidAvdManager",
|
|
|
|
|
"AVD Start Error");
|
|
|
|
|
QMessageBox::critical(Core::ICore::dialogParent(), title,
|
|
|
|
|
QString::fromLatin1(p->readAll()));
|
|
|
|
|
}
|
|
|
|
|
p->deleteLater();
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-06 15:19:56 +02:00
|
|
|
AndroidAvdManager::AndroidAvdManager(const AndroidConfig &config)
|
|
|
|
|
: m_config(config)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-25 12:19:15 +02:00
|
|
|
AndroidAvdManager::~AndroidAvdManager() = default;
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2017-08-18 08:22:34 +02:00
|
|
|
QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
return Utils::runAsync(&createAvdCommand, m_config, info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidAvdManager::removeAvd(const QString &name) const
|
|
|
|
|
{
|
2020-01-13 16:01:56 +01:00
|
|
|
const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
|
|
|
|
|
qCDebug(avdManagerLog) << "Running command (removeAvd):" << command.toUserOutput();
|
2021-06-22 04:33:47 +02:00
|
|
|
QtcProcess proc;
|
2017-04-03 11:11:17 +02:00
|
|
|
proc.setTimeoutS(5);
|
2021-10-06 10:54:44 +03:00
|
|
|
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config));
|
2021-05-17 12:02:42 +02:00
|
|
|
proc.setCommand(command);
|
|
|
|
|
proc.runBlocking();
|
2021-05-28 13:29:05 +02:00
|
|
|
return proc.result() == QtcProcess::FinishedWithSuccess;
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
2021-05-06 15:19:56 +02:00
|
|
|
static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)
|
|
|
|
|
{
|
|
|
|
|
const Utils::FilePath avdPath = Utils::FilePath::fromString(avdPathStr);
|
|
|
|
|
if (avdPath.exists()) {
|
|
|
|
|
const QString configFilePath = avdPath.pathAppended("config.ini").toString();
|
|
|
|
|
QFile configFile(configFilePath);
|
|
|
|
|
if (configFile.open(QIODevice::ReadWrite | QIODevice::Text)) {
|
|
|
|
|
QString newContent;
|
|
|
|
|
QTextStream textStream(&configFile);
|
|
|
|
|
while (!textStream.atEnd()) {
|
|
|
|
|
QString line = textStream.readLine();
|
|
|
|
|
if (!line.contains("hw.device.manufacturer"))
|
|
|
|
|
newContent.append(line + "\n");
|
|
|
|
|
else if (recoverMode)
|
|
|
|
|
newContent.append(line.replace("#", "") + "\n");
|
|
|
|
|
else
|
|
|
|
|
newContent.append("#" + line + "\n");
|
|
|
|
|
}
|
|
|
|
|
configFile.resize(0);
|
|
|
|
|
textStream << newContent;
|
|
|
|
|
configFile.close();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static AndroidDeviceInfoList listVirtualDevices(const AndroidConfig &config)
|
|
|
|
|
{
|
|
|
|
|
QString output;
|
|
|
|
|
AndroidDeviceInfoList avdList;
|
|
|
|
|
/*
|
|
|
|
|
Currenly avdmanager tool fails to parse some AVDs because the correct
|
|
|
|
|
device definitions at devices.xml does not have some of the newest devices.
|
|
|
|
|
Particularly, failing because of tag "hw.device.manufacturer", thus removing
|
|
|
|
|
it would make paring successful. However, it has to be returned afterwards,
|
|
|
|
|
otherwise, Android Studio would give an error during parsing also. So this fix
|
|
|
|
|
aim to keep support for Qt Creator and Android Studio.
|
|
|
|
|
*/
|
|
|
|
|
QStringList allAvdErrorPaths;
|
|
|
|
|
QStringList avdErrorPaths;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
if (!AndroidAvdManager::avdManagerCommand(config, {"list", "avd"}, &output)) {
|
|
|
|
|
qCDebug(avdManagerLog)
|
|
|
|
|
<< "Avd list command failed" << output << config.sdkToolsVersion();
|
|
|
|
|
return {};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
avdErrorPaths.clear();
|
|
|
|
|
avdList = parseAvdList(output, &avdErrorPaths);
|
|
|
|
|
allAvdErrorPaths << avdErrorPaths;
|
|
|
|
|
for (const QString &avdPathStr : qAsConst(avdErrorPaths))
|
|
|
|
|
avdConfigEditManufacturerTag(avdPathStr); // comment out manufacturer tag
|
|
|
|
|
} while (!avdErrorPaths.isEmpty()); // try again
|
|
|
|
|
|
|
|
|
|
for (const QString &avdPathStr : qAsConst(allAvdErrorPaths))
|
|
|
|
|
avdConfigEditManufacturerTag(avdPathStr, true); // re-add manufacturer tag
|
|
|
|
|
|
|
|
|
|
return avdList;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const
|
|
|
|
|
{
|
2021-05-06 15:19:56 +02:00
|
|
|
return Utils::runAsync(listVirtualDevices, m_config);
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString AndroidAvdManager::startAvd(const QString &name) const
|
|
|
|
|
{
|
|
|
|
|
if (!findAvd(name).isEmpty() || startAvdAsync(name))
|
|
|
|
|
return waitForAvd(name);
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
|
|
|
|
|
{
|
2018-04-18 12:23:02 +02:00
|
|
|
QFileInfo info(m_config.emulatorToolPath().toString());
|
|
|
|
|
if (!info.exists()) {
|
|
|
|
|
QMessageBox::critical(Core::ICore::dialogParent(),
|
|
|
|
|
tr("Emulator Tool Is Missing"),
|
|
|
|
|
tr("Install the missing emulator tool (%1) to the"
|
|
|
|
|
" installed Android SDK.")
|
|
|
|
|
.arg(m_config.emulatorToolPath().toString()));
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2018-07-25 12:19:15 +02:00
|
|
|
auto avdProcess = new QProcess();
|
2019-02-07 13:04:20 +01:00
|
|
|
avdProcess->setProcessChannelMode(QProcess::MergedChannels);
|
2018-04-19 09:18:42 +02:00
|
|
|
QObject::connect(avdProcess,
|
2019-02-26 09:40:49 +01:00
|
|
|
QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
2018-04-19 09:18:42 +02:00
|
|
|
avdProcess,
|
|
|
|
|
std::bind(&avdProcessFinished, std::placeholders::_1, avdProcess));
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
// start the emulator
|
|
|
|
|
QStringList arguments;
|
|
|
|
|
if (AndroidConfigurations::force32bitEmulator())
|
|
|
|
|
arguments << "-force-32bit";
|
|
|
|
|
|
2020-10-06 18:49:15 +02:00
|
|
|
arguments << m_config.emulatorArgs()
|
2017-04-03 11:11:17 +02:00
|
|
|
<< "-avd" << avdName;
|
2020-01-13 16:01:56 +01:00
|
|
|
qCDebug(avdManagerLog) << "Running command (startAvdAsync):"
|
|
|
|
|
<< CommandLine(m_config.emulatorToolPath(), arguments).toUserOutput();
|
2017-04-03 11:11:17 +02:00
|
|
|
avdProcess->start(m_config.emulatorToolPath().toString(), arguments);
|
|
|
|
|
if (!avdProcess->waitForStarted(-1)) {
|
|
|
|
|
delete avdProcess;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString AndroidAvdManager::findAvd(const QString &avdName) const
|
|
|
|
|
{
|
|
|
|
|
QVector<AndroidDeviceInfo> devices = m_config.connectedDevices();
|
|
|
|
|
foreach (AndroidDeviceInfo device, devices) {
|
|
|
|
|
if (device.type != AndroidDeviceInfo::Emulator)
|
|
|
|
|
continue;
|
|
|
|
|
if (device.avdname == avdName)
|
|
|
|
|
return device.serialNumber;
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated
thread. Communication between the step and the manager happened via a
QFutureInterface that was passed into the step's run() function.
Later, new steps were added that operated asynchronously, so the build
manager had to differentiate between the different kinds of steps for
starting and stopping.
These days, almost all build and deploy steps work asynchronously, which
made the QFuture-based interface look increasingly odd.
With this patch, all build steps are expected to work asynchronously, so
the build manager no longer needs to differentiate. Steps are started
and requested to stop via the run() and cancel() functions,
respectively, and emit the finished() signal when they are done. Build
step implementors no longer have to deal with a QFutureInterface. For
steps whose implementation is inherently synchronous, the BuildStep base
class offers a runInThread() function.
Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803
Reviewed-by: hjk <hjk@qt.io>
2019-01-25 14:26:34 +01:00
|
|
|
QString AndroidAvdManager::waitForAvd(const QString &avdName,
|
|
|
|
|
const std::function<bool()> &cancelChecker) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
// we cannot use adb -e wait-for-device, since that doesn't work if a emulator is already running
|
|
|
|
|
// 60 rounds of 2s sleeping, two minutes for the avd to start
|
|
|
|
|
QString serialNumber;
|
|
|
|
|
for (int i = 0; i < 60; ++i) {
|
2021-08-24 11:02:45 +02:00
|
|
|
if (cancelChecker && cancelChecker())
|
2017-04-03 11:11:17 +02:00
|
|
|
return QString();
|
|
|
|
|
serialNumber = findAvd(avdName);
|
|
|
|
|
if (!serialNumber.isEmpty())
|
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated
thread. Communication between the step and the manager happened via a
QFutureInterface that was passed into the step's run() function.
Later, new steps were added that operated asynchronously, so the build
manager had to differentiate between the different kinds of steps for
starting and stopping.
These days, almost all build and deploy steps work asynchronously, which
made the QFuture-based interface look increasingly odd.
With this patch, all build steps are expected to work asynchronously, so
the build manager no longer needs to differentiate. Steps are started
and requested to stop via the run() and cancel() functions,
respectively, and emit the finished() signal when they are done. Build
step implementors no longer have to deal with a QFutureInterface. For
steps whose implementation is inherently synchronous, the BuildStep base
class offers a runInThread() function.
Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803
Reviewed-by: hjk <hjk@qt.io>
2019-01-25 14:26:34 +01:00
|
|
|
return waitForBooted(serialNumber, cancelChecker) ? serialNumber : QString();
|
2017-04-03 11:11:17 +02:00
|
|
|
QThread::sleep(2);
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidAvdManager::isAvdBooted(const QString &device) const
|
|
|
|
|
{
|
|
|
|
|
QStringList arguments = AndroidDeviceInfo::adbSelector(device);
|
|
|
|
|
arguments << "shell" << "getprop" << "init.svc.bootanim";
|
|
|
|
|
|
2020-01-13 16:01:56 +01:00
|
|
|
const CommandLine command({m_config.adbToolPath(), arguments});
|
|
|
|
|
qCDebug(avdManagerLog) << "Running command (isAvdBooted):" << command.toUserOutput();
|
2021-06-22 04:33:47 +02:00
|
|
|
QtcProcess adbProc;
|
2017-04-03 11:11:17 +02:00
|
|
|
adbProc.setTimeoutS(10);
|
2021-05-17 12:02:42 +02:00
|
|
|
adbProc.setCommand(command);
|
|
|
|
|
adbProc.runBlocking();
|
2021-05-28 13:19:38 +02:00
|
|
|
if (adbProc.result() != QtcProcess::FinishedWithSuccess)
|
2017-04-03 11:11:17 +02:00
|
|
|
return false;
|
2021-05-12 14:25:50 +02:00
|
|
|
QString value = adbProc.allOutput().trimmed();
|
2017-04-03 11:11:17 +02:00
|
|
|
return value == "stopped";
|
|
|
|
|
}
|
|
|
|
|
|
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated
thread. Communication between the step and the manager happened via a
QFutureInterface that was passed into the step's run() function.
Later, new steps were added that operated asynchronously, so the build
manager had to differentiate between the different kinds of steps for
starting and stopping.
These days, almost all build and deploy steps work asynchronously, which
made the QFuture-based interface look increasingly odd.
With this patch, all build steps are expected to work asynchronously, so
the build manager no longer needs to differentiate. Steps are started
and requested to stop via the run() and cancel() functions,
respectively, and emit the finished() signal when they are done. Build
step implementors no longer have to deal with a QFutureInterface. For
steps whose implementation is inherently synchronous, the BuildStep base
class offers a runInThread() function.
Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803
Reviewed-by: hjk <hjk@qt.io>
2019-01-25 14:26:34 +01:00
|
|
|
bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
|
|
|
|
|
const std::function<bool()> &cancelChecker) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
// found a serial number, now wait until it's done booting...
|
|
|
|
|
for (int i = 0; i < 60; ++i) {
|
2021-08-24 11:02:45 +02:00
|
|
|
if (cancelChecker && cancelChecker())
|
2017-04-03 11:11:17 +02:00
|
|
|
return false;
|
|
|
|
|
if (isAvdBooted(serialNumber)) {
|
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
QThread::sleep(2);
|
|
|
|
|
if (!m_config.isConnected(serialNumber)) // device was disconnected
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace Android
|