diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 70890dfc791..b2021b34a1f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -460,7 +460,7 @@ QVector AndroidConfig::connectedDevices(QString *error) const QVector devices; QProcess adbProc; adbProc.start(adbToolPath().toString(), QStringList() << QLatin1String("devices")); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); if (error) *error = QApplication::translate("AndroidConfiguration", @@ -729,7 +729,7 @@ bool AndroidConfig::isBootToQt(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return false; } @@ -745,7 +745,7 @@ int AndroidConfig::getSDKVersion(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return -1; } @@ -768,7 +768,7 @@ QString AndroidConfig::getProductModel(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return device; } @@ -788,7 +788,7 @@ bool AndroidConfig::hasFinishedBooting(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return false; } @@ -811,7 +811,7 @@ QStringList AndroidConfig::getAbis(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return result; } diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index d3bdaf9dd29..565466a266e 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -281,7 +281,7 @@ unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestin QStringList arguments = AndroidDeviceInfo::adbSelector(m_deviceSerialNumber); arguments << QLatin1String("ls") << destination; process.start(AndroidConfigurations::currentConfig().adbToolPath().toString(), arguments); - if (!process.waitForFinished(5000) + if (!process.waitForFinished(10000) || process.exitCode() != 0) return 0; QByteArray output = process.readAll(); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index c04664f56bb..4958b1be8d4 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -240,7 +240,7 @@ void AndroidRunner::asyncStart() emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1.").arg(adb.errorString())); return; } - if (!adb.waitForFinished(5000)) { + if (!adb.waitForFinished(10000)) { emit remoteProcessFinished(tr("Failed to forward C++ debugging ports.")); return; } @@ -283,7 +283,7 @@ void AndroidRunner::asyncStart() emit remoteProcessFinished(tr("Failed to start the activity. Reason: %1.").arg(adb.errorString())); return; } - if (!adb.waitForFinished(5000)) { + if (!adb.waitForFinished(10000)) { adb.terminate(); emit remoteProcessFinished(tr("Unable to start \"%1\".").arg(m_packageName)); return;