Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev

2014-09-10 00:48:40 +00:00
parent af85b74046 b17031bed0
commit 72e5583d2a
2 changed files with 10 additions and 5 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -245,7 +245,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
            removeAllDevices();
        }

-        mLocalManager.getCachedDeviceManager().clearCachedDevices();
+        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
        mAvailableDevicesCategory.removeAll();
        mInitialScanStarted = true;
        mLocalAdapter.startScanning(true);