diff options
author | PauloftheWest <paulofthewest@google.com> | 2014-08-20 21:09:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 22:53:25 +0000 |
commit | d251fba2fe308ea6aa18002c92506fca9d53848d (patch) | |
tree | a71f3d61ef852a99b5d6ec87b3638809e53dd885 /src/com/android/settings/bluetooth | |
parent | 23d8742df6719f3f20545fc345b9f1cc74c6165a (diff) | |
parent | 637f1b4e45c5cddd2f4fb6061ccac45e2f1c9664 (diff) | |
download | packages_apps_Settings-d251fba2fe308ea6aa18002c92506fca9d53848d.tar.gz packages_apps_Settings-d251fba2fe308ea6aa18002c92506fca9d53848d.tar.bz2 packages_apps_Settings-d251fba2fe308ea6aa18002c92506fca9d53848d.zip |
Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
Diffstat (limited to 'src/com/android/settings/bluetooth')
-rwxr-xr-x | src/com/android/settings/bluetooth/BluetoothSettings.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 3c62ba911..8ea680f01 100755 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -230,10 +230,19 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem } private void startScanning() { - if (isUiRestricted()) return; + if (isUiRestricted()) { + return; + } + if (!mAvailableDevicesCategoryIsPresent) { getPreferenceScreen().addPreference(mAvailableDevicesCategory); } + + if (mAvailableDevicesCategory != null) { + setDeviceListGroup(mAvailableDevicesCategory); + removeAllDevices(); + } + mLocalManager.getCachedDeviceManager().clearCachedDevices(); mAvailableDevicesCategory.removeAll(); mLocalAdapter.startScanning(true); |