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

2023-05-05 18:12:55 +00:00
parent c4f7591217 183c8a3a27
commit 72d3082e8a
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java
@@ -1031,7 +1031,8 @@ public class AudioDeviceInventory {
        synchronized (rolesMap) {
            Pair<Integer, Integer> key = new Pair<>(useCase, role);
            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> appliedDevices = new ArrayList<>();