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

Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2023-05-05 18:12:55 +00:00
committed by Android (Google) Code Review
parent c4f7591217 183c8a3a27
commit 72d3082e8a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1031,7 +1031,8 @@ public class AudioDeviceInventory {
synchronized (rolesMap) { synchronized (rolesMap) {
Pair<Integer, Integer> key = new Pair<>(useCase, role); Pair<Integer, Integer> key = new Pair<>(useCase, role);
if (!rolesMap.containsKey(key)) { if (!rolesMap.containsKey(key)) {
return AudioSystem.SUCCESS; // trying to remove a role for a device that wasn't set
return AudioSystem.BAD_VALUE;
} }
List<AudioDeviceAttributes> roleDevices = rolesMap.get(key); List<AudioDeviceAttributes> roleDevices = rolesMap.get(key);
List<AudioDeviceAttributes> appliedDevices = new ArrayList<>(); List<AudioDeviceAttributes> appliedDevices = new ArrayList<>();