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

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

Merge "audio: Modify conditions to reduce unnecessary lock waiting behavior."... 

Merge "audio: Modify conditions to reduce unnecessary lock waiting behavior." into main am: a69b6528 am: d5fbb6be

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



Change-Id: I4448e1ae0e06715f59b33e2cc9495e7fefa7db09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51577d11 d5fbb6be

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

+2 −2
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ public class AudioDeviceBroker { 
            Log.v(TAG, "setCommunicationDevice, device: " + device + ", uid: " + uid);

        }



        synchronized (mDeviceStateLock) {

        if (device == null) {

            synchronized (mDeviceStateLock) {

                CommunicationRouteClient client = getCommunicationRouteClientForUid(uid);

                if (client == null) {

                    return false;