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

Commit 6faad0d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: Fixed dead lock in AudioService during volume change"

parents b6dcbae8 5d8d1ed8

media/java/android/media/AudioService.java

+4 −3
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ public class AudioService extends IAudioService.Stub { 
                            device);

        }



        public synchronized boolean setIndex(int index, int device) {

        public boolean setIndex(int index, int device) {

            int oldIndex = getIndex(device);

            index = getValidIndex(index);

            synchronized (mCameraSoundForced) {
@@ -2979,8 +2979,9 @@ public class AudioService extends IAudioService.Stub { 
                    index = mIndexMax;

                }

            }

            synchronized (this) {

                mIndex.put(device, index);



            }

            if (oldIndex != index) {

                // Apply change to all streams using this one as alias

                // if changing volume of current device, also change volume of current