diff options
| author | Simran Basi <sbasi@google.com> | 2017-08-30 14:10:52 -0700 |
|---|---|---|
| committer | Simran Basi <sbasi@google.com> | 2017-08-30 21:12:22 +0000 |
| commit | 994dd2794994916051259fa6e5d8aa387619107e (patch) | |
| tree | 29d1c886099e43ad27fb1b1f41eae8034d20c127 /src | |
| parent | cf51f66fe12f8f476dd56b952056f305c78e195e (diff) | |
| download | tradefederation-994dd2794994916051259fa6e5d8aa387619107e.tar.gz | |
DeviceManager: Extend ddmlib timeout from 30 secs to 2 mins.
30 seconds is not enough time to upload an apk to GCE AVD.
Bug: 65207479
Test: tradefed.sh run commandAndExit template/local_min --template:map \
test=FrameworksNotificationTests
Change-Id: Ia459ed5b62959b0ea9fa09e577fc8f6f86f743d4
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/tradefed/device/DeviceManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/tradefed/device/DeviceManager.java b/src/com/android/tradefed/device/DeviceManager.java index 5f99ce3a1..36c2bd770 100644 --- a/src/com/android/tradefed/device/DeviceManager.java +++ b/src/com/android/tradefed/device/DeviceManager.java @@ -229,7 +229,7 @@ public class DeviceManager implements IDeviceManager { /** Initialize adb connection and services depending on adb connection. */ private synchronized void startAdbBridgeAndDependentServices() { // TODO: Temporarily increase default timeout as workaround for syncFiles timeouts - DdmPreferences.setTimeOut(30 * 1000); + DdmPreferences.setTimeOut(120 * 1000); mAdbBridge = createAdbBridge(); mManagedDeviceListener = new ManagedDeviceListener(); // It's important to add the listener before initializing the ADB bridge to avoid a race |