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

AudioService: fix internal use of getDevicesForAttributes()

Browse Source 
No permission check required for internal use of
getDevicesForAttributes()

Bug: 163447106
Test: atest android.media.cts.AudioManagerTest
Change-Id: I864e42e69e57d9c9c3ef090e97d2d0b98a459ff7
This commit is contained in:
Jean-Michel Trivi
2020-08-11 15:30:25 -07:00
parent 668745be05
commit b19192ecff
1 changed files with 7 additions and 2 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 = getDevicesForAttributes(
List<AudioDeviceAttributes> devicesForAttributes = getDevicesForAttributesInt(
new AudioAttributes.Builder().setInternalLegacyStreamType(streamType).build());
for (AudioDeviceAttributes deviceAttributes : devicesForAttributes) {
if (deviceAttributes.getType() == AudioDeviceInfo.convertInternalDeviceToDeviceType(
@@ -1884,8 +1884,13 @@ public class AudioService extends IAudioService.Stub
/** @see AudioManager#getDevicesForAttributes(AudioAttributes) */
public @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributes(
@NonNull AudioAttributes attributes) {
Objects.requireNonNull(attributes);
enforceModifyAudioRoutingPermission();
return getDevicesForAttributesInt(attributes);
}
protected @NonNull ArrayList<AudioDeviceAttributes> getDevicesForAttributesInt(
@NonNull AudioAttributes attributes) {
Objects.requireNonNull(attributes);
return AudioSystem.getDevicesForAttributes(attributes);
}