diff options
| author | 2019-05-10 15:11:16 +0000 | |
|---|---|---|
| committer | 2019-05-10 15:11:16 +0000 | |
| commit | 076b22f987a34be778047bf304cafe206a32fb92 (patch) | |
| tree | 64145b4cedf89a77a71d12d4415c83f38fd5c4ba | |
| parent | 1a4bce99179f19ba356262ce50497d41726f717e (diff) | |
| parent | 02facb908eea36fa08db1ad0c444af11aa9ab663 (diff) | |
Merge "AudioService: fix cross deadlock" into qt-dev
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index bec064495798..3df5ab87915e 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4974,19 +4974,17 @@ public class AudioService extends IAudioService.Stub } private void onSetVolumeIndexOnDevice(@NonNull DeviceVolumeUpdate update) { - synchronized (VolumeStreamState.class) { - final VolumeStreamState streamState = mStreamStates[update.mStreamType]; - if (update.hasVolumeIndex()) { - final int index = update.getVolumeIndex(); - streamState.setIndex(index, update.mDevice, update.mCaller); - sVolumeLogger.log(new AudioEventLogger.StringEvent(update.mCaller + " dev:0x" - + Integer.toHexString(update.mDevice) + " volIdx:" + index)); - } else { - sVolumeLogger.log(new AudioEventLogger.StringEvent(update.mCaller - + " update vol on dev:0x" + Integer.toHexString(update.mDevice))); - } - setDeviceVolume(streamState, update.mDevice); + final VolumeStreamState streamState = mStreamStates[update.mStreamType]; + if (update.hasVolumeIndex()) { + final int index = update.getVolumeIndex(); + streamState.setIndex(index, update.mDevice, update.mCaller); + sVolumeLogger.log(new AudioEventLogger.StringEvent(update.mCaller + " dev:0x" + + Integer.toHexString(update.mDevice) + " volIdx:" + index)); + } else { + sVolumeLogger.log(new AudioEventLogger.StringEvent(update.mCaller + + " update vol on dev:0x" + Integer.toHexString(update.mDevice))); } + setDeviceVolume(streamState, update.mDevice); } /*package*/ void setDeviceVolume(VolumeStreamState streamState, int device) { |