| commit | 9ec4caffc52f48dc91a04240354a363437c1f94f | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Sat Feb 16 04:06:12 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Feb 16 04:06:13 2013 +0000 |
| tree | fd0a6bcb64cf005ea22178362f494936d002dc8b | |
| parent | 2a1b267aede58357a945af865edd9fdbd11d8488 [diff] | |
| parent | 2aee05a5e6240bed398f88beda57d02a70fdf9b1 [diff] |
Merge "increase reboot timeout to 10 mins"
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java index b79f8a5..2b08f00 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -465,7 +465,7 @@ } private void rebootDevice() throws DeviceNotAvailableException { - final int TIMEOUT_MS = 4 * 60 * 1000; + final int TIMEOUT_MS = 10 * 60 * 1000; TestDeviceOptions options = mDevice.getOptions(); // store default value and increase time-out for reboot int rebootTimeout = options.getRebootTimeout();