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

Revert "AudioService: fix internal use of getDevicesForAttributes()"

Browse Source 
Revert submission 12354482-fix_getDevicesForAttributes_internal

Reason for revert: SC blocking bug: 163642647
Reverted Changes:
I5b58be3e6:Revert "Revert "Fix mute issue when changing audio...
I864e42e69:AudioService: fix internal use of getDevicesForAtt...

Change-Id: I3eefec4a7af2f64ae0e9a6d89544b19610e51643
This commit is contained in:
Daniel Chapin
2020-08-17 23:32:41 +00:00
parent b19192ecff
commit 82b16fedb9
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1338,7 +1338,7 @@ public class AudioService extends IAudioService.Stub
}
// Check if device to be updated is routed for the given audio stream
List<AudioDeviceAttributes> devicesForAttributes = getDevicesForAttributesInt(
List<AudioDeviceAttributes> devicesForAttributes = getDevicesForAttributes(
new AudioAttributes.Builder().setInternalLegacyStreamType(streamType).build());
for (AudioDeviceAttributes deviceAttributes : devicesForAttributes) {
if (deviceAttributes.getType() == AudioDeviceInfo.convertInternalDeviceToDeviceType(
@@ -1884,13 +1884,8 @@ public class AudioService extends IAudioService.Stub
/** @see AudioManager#getDevicesForAttributes(AudioAttributes) */
public @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributes(
@NonNull AudioAttributes attributes) {
enforceModifyAudioRoutingPermission();
return getDevicesForAttributesInt(attributes);
}
protected @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributesInt(
@NonNull AudioAttributes attributes) {
Objects.requireNonNull(attributes);
enforceModifyAudioRoutingPermission();
return AudioSystem.getDevicesForAttributes(attributes);
}