commit 912574a3492e9719aee8158637613e754027052d
author Brian Muramatsu <btmura@google.com> Fri Jun 08 16:35:27 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 08 16:35:27 2012 -0700
tree e473588f268d209d902a3f6f4d8f0d121694e98f
parent e8fe123f7629b822b218dfe9a0d0f649eacdb5a5
parent 84d1b9840e66c22a9938e09cd9d9422660c7ef26

Merge "Check if accessibility is enabled in test" into jb-dev

tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java

diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index 1a8b3a8..e8e32ee 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -31,8 +31,8 @@
  * BluetoothAdapter}.
  */
 public class BasicAdapterTest extends AndroidTestCase {
-    private static final int DISABLE_TIMEOUT = 20000; // ms timeout for BT disable
-    private static final int ENABLE_TIMEOUT = 20000;  // ms timeout for BT enable
+    private static final int DISABLE_TIMEOUT = 60000; // ms timeout for BT disable
+    private static final int ENABLE_TIMEOUT = 60000;  // ms timeout for BT enable
     private static final int POLL_TIME = 400;         // ms to poll BT state
 
     private boolean mHasBluetooth;