diff options
| author | Simran Basi <sbasi@google.com> | 2017-09-06 19:44:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 19:44:34 +0000 |
| commit | 8060e9e0a436d948e0e91b141ec8f2e83993697e (patch) | |
| tree | 0a892d3eddd7e76010a948bfb806a7711442867c /src/com/android/tradefed | |
| parent | c9e9f11610ca3b6697a390cc75ac9dc2bc9881e9 (diff) | |
| parent | 752ca9c0bb31243d0598a942aa4976e2039e2f71 (diff) | |
| download | tradefederation-8060e9e0a436d948e0e91b141ec8f2e83993697e.tar.gz | |
Merge "DeviceManager: Extend ddmlib timeout from 30 secs to 2 mins." into oc-dev
am: 752ca9c0bb
Change-Id: Icd5f65d9cceff581c70e64d0201f950e879628cf
Diffstat (limited to 'src/com/android/tradefed')
| -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 |