Skip to content

Commit c7c4751

Browse files
Merge pull request #2472 from MGaetan89:fix_306324391
PiperOrigin-RevId: 765228914
2 parents e69d7c8 + 6f807ae commit c7c4751

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -657,18 +657,10 @@ public static AudioCapabilities getCapabilitiesInternalForDirectPlayback(
657657
@Nullable
658658
public static AudioDeviceInfoApi23 getDefaultRoutedDeviceForAttributes(
659659
AudioManager audioManager, AudioAttributes audioAttributes) {
660-
List<AudioDeviceInfo> audioDevices;
661-
try {
662-
audioDevices =
663-
checkNotNull(audioManager)
664-
.getAudioDevicesForAttributes(
665-
audioAttributes.getAudioAttributesV21().audioAttributes);
666-
} catch (RuntimeException e) {
667-
// Audio manager failed to retrieve devices.
668-
// TODO: b/306324391 - Remove once https://github.com/robolectric/robolectric/commit/442dff
669-
// is released.
670-
return null;
671-
}
660+
List<AudioDeviceInfo> audioDevices =
661+
checkNotNull(audioManager)
662+
.getAudioDevicesForAttributes(
663+
audioAttributes.getAudioAttributesV21().audioAttributes);
672664
if (audioDevices.isEmpty()) {
673665
// Can't find current device.
674666
return null;

0 commit comments

Comments
 (0)