diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index b154ea0252f..6a643b5682f 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -25,13 +25,6 @@ namespace Android::Internal::AndroidAvdManager { static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg) -QString startAvd(const QString &name, const std::optional> &future) -{ - if (!findAvd(name).isEmpty() || startAvdAsync(name)) - return waitForAvd(name, future); - return {}; -} - // TODO: Make async and move out of startAvdImpl, make it a part of startAvdRecipe. static bool is32BitUserSpace() { @@ -198,37 +191,6 @@ ExecutableItem serialNumberRecipe(const QString &avdName, const Storage }; } -static bool waitForBooted(const QString &serialNumber, const std::optional> &future) -{ - // found a serial number, now wait until it's done booting... - for (int i = 0; i < 60; ++i) { - if (future && future->isCanceled()) - return false; - if (isAvdBooted(serialNumber)) - return true; - QThread::sleep(2); - if (!AndroidConfig::isConnected(serialNumber)) // device was disconnected - return false; - } - return false; -} - -QString waitForAvd(const QString &avdName, const std::optional> &future) -{ - // 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) { - if (future && future->isCanceled()) - return {}; - serialNumber = findAvd(avdName); - if (!serialNumber.isEmpty()) - return waitForBooted(serialNumber, future) ? serialNumber : QString(); - QThread::sleep(2); - } - return {}; -} - static ExecutableItem isAvdBootedRecipe(const Storage &serialNumberStorage) { const auto onSetup = [serialNumberStorage](Process &process) { diff --git a/src/plugins/android/androidavdmanager.h b/src/plugins/android/androidavdmanager.h index 23357500b05..16ea98a572a 100644 --- a/src/plugins/android/androidavdmanager.h +++ b/src/plugins/android/androidavdmanager.h @@ -2,18 +2,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once -#include - -#include - #include namespace Android::Internal::AndroidAvdManager { -QString startAvd(const QString &name, const std::optional> &future = {}); bool startAvdAsync(const QString &avdName); QString findAvd(const QString &avdName); -QString waitForAvd(const QString &avdName, const std::optional> &future = {}); bool isAvdBooted(const QString &device); Tasking::ExecutableItem serialNumberRecipe(