Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev

This commit is contained in:
Jason Monk
2016-07-25 18:35:56 +00:00
committed by Android (Google) Code Review

View File

@@ -320,11 +320,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
messageId = R.string.bluetooth_empty_list_user_restricted;
break;
}
if (getPreferenceScreen().getPreferenceCount() == 0) {
getPreferenceScreen().removeAll();
getPreferenceScreen().addPreference(mPairedDevicesCategory);
getPreferenceScreen().addPreference(mAvailableDevicesCategory);
getPreferenceScreen().addPreference(mMyDevicePreference);
}
// Paired devices category
addDeviceCategory(mPairedDevicesCategory,