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

Commit 754e8227 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into... 

Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev am: 72d3082e

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



Change-Id: I111d17647bfe674b148936fdf7a110fd8d741585
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 412d9d9f 72d3082e

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1031,7 +1031,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 remove a role for a device that wasn't set

                return AudioSystem.BAD_VALUE;

            }

            }

            List<AudioDeviceAttributes> roleDevices = rolesMap.get(key);

            List<AudioDeviceAttributes> roleDevices = rolesMap.get(key);

            List<AudioDeviceAttributes> appliedDevices = new ArrayList<>();

            List<AudioDeviceAttributes> appliedDevices = new ArrayList<>();