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

Merge "Fix ACTION_VOLUME_CHANGED behavior" into tm-qpr-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2022-11-23 16:15:21 +00:00
committed by Android (Google) Code Review
parent b9745ad64b 473f4861c5
commit a6abfc6e1a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3710,6 +3710,10 @@ public class AudioService extends IAudioService.Stub
Objects.requireNonNull(vi); Objects.requireNonNull(vi);
Objects.requireNonNull(ada); Objects.requireNonNull(ada);
Objects.requireNonNull(callingPackage); Objects.requireNonNull(callingPackage);
AudioService.sVolumeLogger.loglogi("setDeviceVolume" + " from:" + callingPackage + " "
+ vi + " " + ada, TAG);
if (!vi.hasStreamType()) { if (!vi.hasStreamType()) {
Log.e(TAG, "Unsupported non-stream type based VolumeInfo", new Exception()); Log.e(TAG, "Unsupported non-stream type based VolumeInfo", new Exception());
return; return;
@@ -7839,6 +7843,7 @@ public class AudioService extends IAudioService.Stub
boolean hasModifyAudioSettings) { boolean hasModifyAudioSettings) {
boolean changed; boolean changed;
int oldIndex; int oldIndex;
final boolean isCurrentDevice;
synchronized (mSettingsLock) { synchronized (mSettingsLock) {
synchronized (VolumeStreamState.class) { synchronized (VolumeStreamState.class) {
oldIndex = getIndex(device); oldIndex = getIndex(device);
@@ -7854,7 +7859,7 @@ public class AudioService extends IAudioService.Stub
// - there is no volume index stored for this device on alias stream. // - there is no volume index stored for this device on alias stream.
// If changing volume of current device, also change volume of current // If changing volume of current device, also change volume of current
// device on aliased stream // device on aliased stream
final boolean isCurrentDevice = (device == getDeviceForStream(mStreamType)); isCurrentDevice = (device == getDeviceForStream(mStreamType));
final int numStreamTypes = AudioSystem.getNumStreamTypes(); final int numStreamTypes = AudioSystem.getNumStreamTypes();
for (int streamType = numStreamTypes - 1; streamType >= 0; streamType--) { for (int streamType = numStreamTypes - 1; streamType >= 0; streamType--) {
final VolumeStreamState aliasStreamState = mStreamStates[streamType]; final VolumeStreamState aliasStreamState = mStreamStates[streamType];
@@ -7894,8 +7899,9 @@ public class AudioService extends IAudioService.Stub
EventLogTags.writeVolumeChanged(mStreamType, oldIndex, index, mIndexMax / 10, EventLogTags.writeVolumeChanged(mStreamType, oldIndex, index, mIndexMax / 10,
caller); caller);
} }
// fire changed intents for all streams // fire changed intents for all streams, but only when the device it changed on
if (index != oldIndex) { // is the current device
if ((index != oldIndex) && isCurrentDevice) {
mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, index); mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, index);
mVolumeChanged.putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, oldIndex); mVolumeChanged.putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, oldIndex);
mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS,