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" am: d2717d9e9d am: 9825982bcb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcb46717cded982013470d9a45346612ab1109e5
This commit is contained in:
Eric Laurent
2021-02-24 18:26:49 +00:00
committed by Automerger Merge Worker
parent d77e30fade 9825982bcb
commit 88ce193355
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) {
final VolumeStreamState streamState = mStreamStates[update.mStreamType];
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,
// trusted as index is always validated before message is posted
true /*hasModifyAudioSettings*/);