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

AudioDeviceVolumeManager.getDeviceVolume fix returned VolumeInfo

Browse Source 
For the VolumeInfo instance returned by getDeviceVolume:
- fix missing rescaling of the min/max volume index,
- do not always configure it the have a mute command

Bug: 271473257
Test: atest android.media.audio.cts.AudioDeviceVolumeManagerTest#testSetGetVolume
Change-Id: I676cb6fca3f301d80a54f6b149ed081c0de48bba
This commit is contained in:
Jean-Michel Trivi
2023-04-18 16:07:00 -07:00
parent 011d00e117
commit d1abd83360
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4993,8 +4993,8 @@ public class AudioService extends IAudioService.Stub
int streamType = vi.getStreamType();
final VolumeInfo.Builder vib = new VolumeInfo.Builder(vi);
vib.setMinVolumeIndex(mStreamStates[streamType].mIndexMin);
vib.setMaxVolumeIndex(mStreamStates[streamType].mIndexMax);
vib.setMinVolumeIndex((mStreamStates[streamType].mIndexMin + 5) / 10);
vib.setMaxVolumeIndex((mStreamStates[streamType].mIndexMax + 5) / 10);
synchronized (VolumeStreamState.class) {
final int index;
if (isFixedVolumeDevice(ada.getInternalType())) {
@@ -5003,7 +5003,11 @@ public class AudioService extends IAudioService.Stub
index = (mStreamStates[streamType].getIndex(ada.getInternalType()) + 5) / 10;
}
vib.setVolumeIndex(index);
return vib.setMuted(mStreamStates[streamType].mIsMuted).build();
// only set as a mute command if stream muted
if (mStreamStates[streamType].mIsMuted) {
vib.setMuted(true);
}
return vib.build();
}
}