summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-03-25 15:57:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-25 15:57:17 -0700
commit9166a9635e197777b0079798d3511137baf936f5 (patch)
tree27838d29a21c1a0b1af5184c9cebb86d3fada944
parent9303d97e6af2ef957acd0b25a44f4bce6b2f4960 (diff)
parentcdc5e6eea2ba96f175433221488e845f7f1ab97b (diff)
downloadpackages_apps_settings-9166a9635e197777b0079798d3511137baf936f5.zip
packages_apps_settings-9166a9635e197777b0079798d3511137baf936f5.tar.gz
packages_apps_settings-9166a9635e197777b0079798d3511137baf936f5.tar.bz2
Merge "Stop scanning as soon as device is picked in the device picker."
-rw-r--r--src/com/android/settings/bluetooth/BluetoothSettings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 42e5832..1e73b2d 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -230,6 +230,7 @@ public class BluetoothSettings extends PreferenceActivity
CachedBluetoothDevice device = btPreference.getCachedDevice();
mSelectedDevice = device.getDevice();
+ mLocalManager.stopScanning();
mLocalManager.persistSelectedDeviceInPicker(mSelectedDevice.getAddress());
if ((device.getBondState() == BluetoothDevice.BOND_BONDED) ||
(mNeedAuth == false)) {