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

Commit 6fe9299a authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "AudioService: fix cross deadlock" into qt-dev 

am: 076b22f9

Change-Id: I3d48403142747f77ee786a084a60b6087aab831d
parents d98250ae 076b22f9

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

+10 −12
Original line number Original line Diff line number Diff line
@@ -4974,7 +4974,6 @@ public class AudioService extends IAudioService.Stub 
    }

    }





    private void onSetVolumeIndexOnDevice(@NonNull DeviceVolumeUpdate update) {

    private void onSetVolumeIndexOnDevice(@NonNull DeviceVolumeUpdate update) {

        synchronized (VolumeStreamState.class) {

        final VolumeStreamState streamState = mStreamStates[update.mStreamType];

        final VolumeStreamState streamState = mStreamStates[update.mStreamType];

        if (update.hasVolumeIndex()) {

        if (update.hasVolumeIndex()) {

            final int index = update.getVolumeIndex();

            final int index = update.getVolumeIndex();
@@ -4987,7 +4986,6 @@ public class AudioService extends IAudioService.Stub 
        }

        }

        setDeviceVolume(streamState, update.mDevice);

        setDeviceVolume(streamState, update.mDevice);

    }

    }

    }





    /*package*/ void setDeviceVolume(VolumeStreamState streamState, int device) {

    /*package*/ void setDeviceVolume(VolumeStreamState streamState, int device) {