diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f5f8693dd135f2741eba72651e9f5c0a90579918..e836ba8c3f390a2234cd2bfb50a93002a76ac8e1 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -673,11 +673,6 @@ QFuture<QVector<AndroidDeviceInfo>> AndroidConfig::androidVirtualDevicesFuture() return QtConcurrent::run(&AndroidConfig::androidVirtualDevices, androidToolPath().toString(), androidToolEnvironment()); } -QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const -{ - return androidVirtualDevices(androidToolPath().toString(), androidToolEnvironment()); -} - QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices(const QString &androidTool, const Environment &environment) { QVector<AndroidDeviceInfo> devices; @@ -685,7 +680,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices(const QString &a proc.setProcessEnvironment(environment.toProcessEnvironment()); proc.start(androidTool, QStringList() << QLatin1String("list") << QLatin1String("avd")); // list available AVDs - if (!proc.waitForFinished(10000)) { + if (!proc.waitForFinished(20000)) { proc.terminate(); return devices; } diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 77c9c5a07517b010cf44b283b4819671c322e90e..906632bd2d0dd4c68890c1ca00e687e732baeecf 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -152,7 +152,6 @@ public: static QVector<AndroidDeviceInfo> connectedDevices(const QString &adbToolPath, QString *error = 0); QFuture<QVector<AndroidDeviceInfo> > androidVirtualDevicesFuture(); - QVector<AndroidDeviceInfo> androidVirtualDevices() const; static QVector<AndroidDeviceInfo> androidVirtualDevices(const QString &androidTool, const Utils::Environment &environment); QString startAVD(const QString &name) const;