diff options
| author | Eric Rowe <erowe@google.com> | 2010-10-22 18:31:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 18:31:31 -0700 |
| commit | 5dcf000117ba97e13c6c6d1d5105c0fa49fa48f6 (patch) | |
| tree | b2c9fbe0a47d5f67e65e0f4f54501f1fbf049bce /core/tests | |
| parent | 1d952ff85e911940381ceb340d49bb80a1c8539a (diff) | |
| parent | 288f13730e6535fb36581781196a55a6f2d198d6 (diff) | |
| download | frameworks_base-5dcf000117ba97e13c6c6d1d5105c0fa49fa48f6.zip frameworks_base-5dcf000117ba97e13c6c6d1d5105c0fa49fa48f6.tar.gz frameworks_base-5dcf000117ba97e13c6c6d1d5105c0fa49fa48f6.tar.bz2 | |
am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '288f13730e6535fb36581781196a55a6f2d198d6'
* commit '288f13730e6535fb36581781196a55a6f2d198d6':
Change disable timeout for BT disable stress test
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java index 82de509..cddf63d 100644 --- a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java +++ b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java @@ -35,7 +35,7 @@ public class BluetoothTestUtils extends Assert { /** * Timeout for {@link BluetoothAdapter#disable()} in ms. */ - private static final int DISABLE_TIMEOUT = 5000; + private static final int DISABLE_TIMEOUT = 20000; /** * Timeout for {@link BluetoothAdapter#enable()} in ms. |