Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index ba3336e..71ebcb5 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -320,11 +320,10 @@
messageId = R.string.bluetooth_empty_list_user_restricted;
break;
}
- if (getPreferenceScreen().getPreferenceCount() == 0) {
- getPreferenceScreen().addPreference(mPairedDevicesCategory);
- getPreferenceScreen().addPreference(mAvailableDevicesCategory);
- getPreferenceScreen().addPreference(mMyDevicePreference);
- }
+ getPreferenceScreen().removeAll();
+ getPreferenceScreen().addPreference(mPairedDevicesCategory);
+ getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+ getPreferenceScreen().addPreference(mMyDevicePreference);
// Paired devices category
addDeviceCategory(mPairedDevicesCategory,