Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev

Browse Source
This commit is contained in:
tim peng
2021-03-22 03:22:04 +00:00
committed by Android (Google) Code Review
parent 7dc8ba8c37 1bc02694ea
commit a6b0836e95
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

@@ -205,7 +205,6 @@ public class LocalMediaManager implements BluetoothCallback {
void dispatchDeviceListUpdate() { void dispatchDeviceListUpdate() {
final List<MediaDevice> mediaDevices = new ArrayList<>(mMediaDevices); final List<MediaDevice> mediaDevices = new ArrayList<>(mMediaDevices);
Collections.sort(mediaDevices, COMPARATOR);
for (DeviceCallback callback : getCallbacks()) { for (DeviceCallback callback : getCallbacks()) {
callback.onDeviceListUpdate(mediaDevices); callback.onDeviceListUpdate(mediaDevices);
} }
@@ -465,6 +464,7 @@ public class LocalMediaManager implements BluetoothCallback {
synchronized (mMediaDevicesLock) { synchronized (mMediaDevicesLock) {
mMediaDevices.clear(); mMediaDevices.clear();
mMediaDevices.addAll(devices); mMediaDevices.addAll(devices);
Collections.sort(devices, COMPARATOR);
// Add disconnected bluetooth devices only when phone output device is available. // Add disconnected bluetooth devices only when phone output device is available.
for (MediaDevice device : devices) { for (MediaDevice device : devices) {
final int type = device.getDeviceType(); final int type = device.getDeviceType();