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 am: 72d3082e8a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23059295

Change-Id: I111d17647bfe674b148936fdf7a110fd8d741585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jean-Michel Trivi
2023-05-05 18:29:28 +00:00
committed by Automerger Merge Worker
parent 412d9d9fae 72d3082e8a
commit 754e8227df
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) {
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<>();