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

Android: Increase timeout of android list avd to 20s

Browse Source 
Now that every usage of that command is using it in a separate
thread we can do that without any problems.

Change-Id: If38a734ceb5c519cd3ed28357374c83843e67c8e
Task-number: QTCREATORBUG-13634
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2015-04-29 17:32:04 +02:00
parent 597096312f
commit 11bcc8efe2
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androidconfigurations.cpp
View File

@@ -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;
}