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

Merge "AudioService: setDeviceVolume shouln't change the mute state" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-30 11:48:56 +00:00
committed by Android (Google) Code Review
parent 49a61e54b4 193f562948
commit d2fe4b9e81
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3637,8 +3637,19 @@ public class AudioService extends IAudioService.Stub
return false; return false;
} }
/**
* Update stream volume, ringer mode and mute status after a volume index change
* @param streamType
* @param index
* @param flags
* @param device the device for which the volume is changed
* @param caller
* @param hasModifyAudioSettings
* @param canChangeMute true if the origin of this event is one where the mute state should be
* updated following the change in volume index
*/
private void onSetStreamVolume(int streamType, int index, int flags, int device, private void onSetStreamVolume(int streamType, int index, int flags, int device,
String caller, boolean hasModifyAudioSettings) { String caller, boolean hasModifyAudioSettings, boolean canChangeMute) {
final int stream = mStreamVolumeAlias[streamType]; final int stream = mStreamVolumeAlias[streamType];
setStreamVolumeInt(stream, index, device, false, caller, hasModifyAudioSettings); setStreamVolumeInt(stream, index, device, false, caller, hasModifyAudioSettings);
// setting volume on ui sounds stream type also controls silent mode // setting volume on ui sounds stream type also controls silent mode
@@ -3648,10 +3659,8 @@ public class AudioService extends IAudioService.Stub
TAG + ".onSetStreamVolume", false /*external*/); TAG + ".onSetStreamVolume", false /*external*/);
} }
// setting non-zero volume for a muted stream unmutes the stream and vice versa // setting non-zero volume for a muted stream unmutes the stream and vice versa
// (only when changing volume for the current device),
// except for BT SCO stream where only explicit mute is allowed to comply to BT requirements // except for BT SCO stream where only explicit mute is allowed to comply to BT requirements
if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO) if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO) && canChangeMute) {
&& (getDeviceForStream(stream) == device)) {
// As adjustStreamVolume with muteAdjust flags mute/unmutes stream and aliased streams. // As adjustStreamVolume with muteAdjust flags mute/unmutes stream and aliased streams.
muteAliasStreams(stream, index == 0); muteAliasStreams(stream, index == 0);
} }
@@ -4366,7 +4375,10 @@ public class AudioService extends IAudioService.Stub
mPendingVolumeCommand = new StreamVolumeCommand( mPendingVolumeCommand = new StreamVolumeCommand(
streamType, index, flags, device); streamType, index, flags, device);
} else { } else {
onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings); onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings,
// ada is non-null when called from setDeviceVolume,
// which shouldn't update the mute state
ada == null /*canChangeMute*/);
index = mStreamStates[streamType].getIndex(device); index = mStreamStates[streamType].getIndex(device);
} }
} }
@@ -10275,7 +10287,8 @@ public class AudioService extends IAudioService.Stub
mPendingVolumeCommand.mIndex, mPendingVolumeCommand.mIndex,
mPendingVolumeCommand.mFlags, mPendingVolumeCommand.mFlags,
mPendingVolumeCommand.mDevice, mPendingVolumeCommand.mDevice,
callingPackage, true /*hasModifyAudioSettings*/); callingPackage, true /*hasModifyAudioSettings*/,
true /*canChangeMute*/);
mPendingVolumeCommand = null; mPendingVolumeCommand = null;
} }
} }