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

14
src/plugins/android/androidrunner.cpp
View File

@@ -167,24 +167,20 @@ void AndroidRunner::launchAVD()
AndroidManager::setDeviceSerialNumber(m_target, info.serialNumber);
emit androidDeviceInfoChanged(info);
if (info.isValid()) {
AndroidAvdManager avdManager;
if (!info.avdName.isEmpty() && avdManager.findAvd(info.avdName).isEmpty()) {
bool launched = avdManager.startAvdAsync(info.avdName);
m_launchedAVDName = launched ? info.avdName:"";
} else {
if (!info.avdName.isEmpty() && AndroidAvdManager::findAvd(info.avdName).isEmpty())
m_launchedAVDName = AndroidAvdManager::startAvdAsync(info.avdName) ? info.avdName : "";
else
m_launchedAVDName.clear();
}
}
}
void AndroidRunner::checkAVD()
{
AndroidAvdManager avdManager;
QString serialNumber = avdManager.findAvd(m_launchedAVDName);
const QString serialNumber = AndroidAvdManager::findAvd(m_launchedAVDName);
if (!serialNumber.isEmpty())
return; // try again on next timer hit
if (avdManager.isAvdBooted(serialNumber)) {
if (AndroidAvdManager::isAvdBooted(serialNumber)) {
m_checkAVDTimer.stop();
AndroidManager::setDeviceSerialNumber(m_target, serialNumber);
emit asyncStart();