Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288f1373 authored by Eric Rowe's avatar Eric Rowe Committed by Android Git Automerger
Browse files

am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread

Merge commit '8de43ab5' into gingerbread-plus-aosp

* commit '8de43ab5':
  Change disable timeout for BT disable stress test
parents f5b5d177 8de43ab5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,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.