summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-11-12 09:41:12 -0800
committerJaikumar Ganesh <jaikumar@google.com>2010-11-12 09:41:12 -0800
commit58d0dcb75b776bba0737412d2f5e203792b06a52 (patch)
tree64e0af32cb42d3fecd8405084d0a33c81792d705
parentbb0773fac888c6748cbf778ab5c99c7d0a2c1309 (diff)
downloadframeworks_base-58d0dcb75b776bba0737412d2f5e203792b06a52.zip
frameworks_base-58d0dcb75b776bba0737412d2f5e203792b06a52.tar.gz
frameworks_base-58d0dcb75b776bba0737412d2f5e203792b06a52.tar.bz2
Don't call cancel discovery when its already canceelled.
Reported by: Leijun Tao Change-Id: I5f04ecde16d147776a30810210cd3c973aee4d87
-rw-r--r--core/java/android/server/BluetoothEventLoop.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index 4f56281..56ab6bf 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -287,8 +287,6 @@ class BluetoothEventLoop {
mBluetoothService.setIsDiscovering(true);
intent = new Intent(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
} else {
- // Stop the discovery.
- mBluetoothService.cancelDiscovery();
mBluetoothService.setIsDiscovering(false);
intent = new Intent(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
}