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

Commit e72df0cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AudioDeviceInventory: better error handling in clearDevicesRole" into... 

Merge "AudioDeviceInventory: better error handling in clearDevicesRole" into udc-dev am: 7c20a56b am: e6e43cd1

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



Change-Id: I13aa6cdb66d7744c3e89a99f7fb9f1d76cc22009
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b27ac99 e6e43cd1

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) {