Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "audio:Suppress device volume to safe volume"

Browse Source
This commit is contained in:
Eric Laurent
2021-02-24 15:19:02 +00:00
committed by Gerrit Code Review
parent 8b3ccda6bb 834b5336d6
commit d2717d9e9d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -6554,7 +6554,10 @@ public class AudioService extends IAudioService.Stub
private void onSetVolumeIndexOnDevice(@NonNull DeviceVolumeUpdate update) { private void onSetVolumeIndexOnDevice(@NonNull DeviceVolumeUpdate update) {
final VolumeStreamState streamState = mStreamStates[update.mStreamType]; final VolumeStreamState streamState = mStreamStates[update.mStreamType];
if (update.hasVolumeIndex()) { if (update.hasVolumeIndex()) {
final int index = update.getVolumeIndex(); int index = update.getVolumeIndex();
if (!checkSafeMediaVolume(update.mStreamType, index, update.mDevice)) {
index = safeMediaVolumeIndex(update.mDevice);
}
streamState.setIndex(index, update.mDevice, update.mCaller, streamState.setIndex(index, update.mDevice, update.mCaller,
// trusted as index is always validated before message is posted // trusted as index is always validated before message is posted
true /*hasModifyAudioSettings*/); true /*hasModifyAudioSettings*/);