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 am: 7c20a56b77

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

Change-Id: I74a12900dfd6c331737c714a39240e721c85bedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 16:15:39 +00:00
committed by Automerger Merge Worker
parent abf9728673 7c20a56b77
commit 1056307b75
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) {
Pair<Integer, Integer> key = new Pair<>(useCase, role);
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);
if (status == AudioSystem.SUCCESS) {