Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c20a56b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents af6326c8 f83103ed

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {