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

Merge "AudioService: fix volume behavior for dock devices" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-29 15:30:27 +00:00
committed by Android (Google) Code Review
parent ee54e6170a 4e57c38cc6
commit 67f8ff06b4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7055,9 +7055,10 @@ public class AudioService extends IAudioService.Stub
private @AudioManager.DeviceVolumeBehavior private @AudioManager.DeviceVolumeBehavior
int getDeviceVolumeBehaviorInt(@NonNull AudioDeviceAttributes device) { int getDeviceVolumeBehaviorInt(@NonNull AudioDeviceAttributes device) {
// translate Java device type to native device type (for the devices masks for full / fixed) // Get the internal type set by the AudioDeviceAttributes constructor which is always more
final int audioSystemDeviceOut = AudioDeviceInfo.convertDeviceTypeToInternalDevice( // exact (avoids double conversions) than a conversion from SDK type via
device.getType()); // AudioDeviceInfo.convertDeviceTypeToInternalDevice()
final int audioSystemDeviceOut = device.getInternalType();
int setDeviceVolumeBehavior = retrieveStoredDeviceVolumeBehavior(audioSystemDeviceOut); int setDeviceVolumeBehavior = retrieveStoredDeviceVolumeBehavior(audioSystemDeviceOut);
if (setDeviceVolumeBehavior != AudioManager.DEVICE_VOLUME_BEHAVIOR_UNSET) { if (setDeviceVolumeBehavior != AudioManager.DEVICE_VOLUME_BEHAVIOR_UNSET) {