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

Merge "AudioDeviceInventory: better error handling in clearDevicesRole" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-12 16:02:08 +00:00
committed by Android (Google) Code Review
parent af6326c884 f83103ed8b
commit 7c20a56b77
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

@@ -1100,7 +1100,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 clear a role for a device that wasn't set
return AudioSystem.BAD_VALUE;
} }
final int status = asi.deviceRoleAction(useCase, role, null); final int status = asi.deviceRoleAction(useCase, role, null);
if (status == AudioSystem.SUCCESS) { if (status == AudioSystem.SUCCESS) {