diff options
Diffstat (limited to 'src/com/android/tradefed/device/DeviceManager.java')
-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 |