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

Merge "DO NOT MERGE: Use a copy of bt device profile list when updating" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-31 20:02:08 +00:00
committed by Android (Google) Code Review
parent e10e0fffcf ad08b5b831
commit 055fcec87e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -661,6 +661,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
return Collections.unmodifiableList(mProfiles);
}
public List<LocalBluetoothProfile> getProfileListCopy() {
return new ArrayList<>(mProfiles);
}
public List<LocalBluetoothProfile> getConnectableProfiles() {
List<LocalBluetoothProfile> connectableProfiles =
new ArrayList<LocalBluetoothProfile>();

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
View File

@@ -277,7 +277,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
boolean otherProfileConnected = false;
for (CachedBluetoothDevice device : getDevices()) {
for (LocalBluetoothProfile profile : device.getProfiles()) {
for (LocalBluetoothProfile profile : device.getProfileListCopy()) {
int profileId = profile.getProfileId();
boolean isConnected = device.isConnectedProfile(profile);
if (profileId == BluetoothProfile.HEADSET