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

Android: Transform AndroidAvdManager class into namespace

Browse Source 
Hide waitForBooted() in cpp.
Move avdManagerCommand() into avddialog.cpp, as it's the only
one usage of this method.

Change-Id: Id88ecbb5532a7d2594c65dddc8245573efd41018
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-15 19:45:52 +02:00
parent 6eaa9f099a
commit af3ab760ad
9 changed files with 63 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -264,13 +264,12 @@ void AndroidQmlPreviewWorker::stop()
bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
{
AndroidAvdManager avdMananager;
QString devSN = AndroidManager::deviceSerialNumber(m_rc->target());
if (devSN.isEmpty())
devSN = m_serialNumber;
if (!avdMananager.isAvdBooted(devSN)) {
if (!AndroidAvdManager::isAvdBooted(devSN)) {
const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).get();
if (!dev) {
appendMessage(Tr::tr("Selected device is invalid."), ErrorMessageFormat);
@@ -285,7 +284,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
if (devInfoLocal.isValid()) {
if (dev->machineType() == IDevice::Emulator) {
appendMessage(Tr::tr("Launching AVD."), NormalMessageFormat);
devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdName);
devInfoLocal.serialNumber = AndroidAvdManager::startAvd(devInfoLocal.avdName);
}
if (devInfoLocal.serialNumber.isEmpty()) {
appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat);