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

Merge "AudioDeviceInventory: fix purge of device role cache." into udc-dev

Browse Source
This commit is contained in:
Eric Laurent
2023-06-16 06:49:57 +00:00
committed by Android (Google) Code Review
parent b88da3e9fc 75f1cff15d
commit cd5243dc60
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/audio/AudioDeviceInventory.java
View File

@@ -1199,11 +1199,16 @@ public class AudioDeviceInventory {
AudioDeviceInfo device = Stream.of(connectedDevices) AudioDeviceInfo device = Stream.of(connectedDevices)
.filter(d -> d.getInternalType() == ada.getInternalType()) .filter(d -> d.getInternalType() == ada.getInternalType())
.filter(d -> (!AudioSystem.isBluetoothDevice(d.getInternalType()) .filter(d -> (!AudioSystem.isBluetoothDevice(d.getInternalType())
|| (d.getAddress() == ada.getAddress()))) || (d.getAddress().equals(ada.getAddress()))))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (device == null) { if (device == null) {
if (AudioService.DEBUG_DEVICES) {
Slog.i(TAG, "purgeRoles() removing device: " + ada.toString()
+ ", for strategy: " + keyRole.first
+ " and role: " + keyRole.second);
}
asi.deviceRoleAction(keyRole.first, keyRole.second, Arrays.asList(ada)); asi.deviceRoleAction(keyRole.first, keyRole.second, Arrays.asList(ada));
itDev.remove(); itDev.remove();
} }