Android: Increase timeout of android list avd to 20s

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>

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

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;