aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidrunner.cpp
diff options
context:
space:
mode:
authorDaniel Teske <[email protected]>2014-06-23 14:13:37 +0200
committerDaniel Teske <[email protected]>2014-06-26 11:11:07 +0200
commit9d5ff46534776d9e96a9553d1c3b154b296513f4 (patch)
treeeb53e6c4b532cb16bf8bf5c6bd9525596a301555 /src/plugins/android/androidrunner.cpp
parent5d7963d992185df6259e9a73160ef2e4de5ee8b1 (diff)
Android: Increase timeout for adb to 10s
On some machines adb takes a longer than 5s to finish. The reasons for that are unknown. Change-Id: I949dc40b8f407aa98be0456df47a9ebe88e230a5 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
-rw-r--r--src/plugins/android/androidrunner.cpp4
1 files changed, 2 insertions, 2 deletions
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;