summaryrefslogtreecommitdiffstats
path: root/core/tests/bluetoothtests
diff options
context:
space:
mode:
authorAlbert Mojir <albert.mojir@sonyericsson.com>2011-03-21 14:59:10 +0100
committerJaikumar Ganesh <jaikumar@google.com>2011-06-02 10:30:49 -0700
commitefc1d16374955f04d713c770ab47d90d190afe83 (patch)
tree34d81f7b4a6cbc5c742d1f084c5d54b06f274b31 /core/tests/bluetoothtests
parent108a61cac5b7d6b8d6ce4dfca367888b94bf7ef9 (diff)
downloadframeworks_base-efc1d16374955f04d713c770ab47d90d190afe83.zip
frameworks_base-efc1d16374955f04d713c770ab47d90d190afe83.tar.gz
frameworks_base-efc1d16374955f04d713c770ab47d90d190afe83.tar.bz2
Bluetooth: correcting return value from cancelDiscovery
BluetoothAdapter.cancelDiscovery was previously always returning false. Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
Diffstat (limited to 'core/tests/bluetoothtests')
-rw-r--r--core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java
index f1dd8fe..5f4c226 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java
@@ -678,8 +678,7 @@ public class BluetoothTestUtils extends Assert {
BluetoothReceiver receiver = getBluetoothReceiver(mask);
long start = System.currentTimeMillis();
- // TODO: put assertTrue() around cancelDiscovery() once it starts returning true.
- adapter.cancelDiscovery();
+ assertTrue(adapter.cancelDiscovery());
while (System.currentTimeMillis() - start < START_STOP_SCAN_TIMEOUT) {
if (!adapter.isDiscovering() && ((receiver.getFiredFlags() & mask) == mask)) {