diff options
| author | 2023-10-17 14:10:40 +0000 | |
|---|---|---|
| committer | 2023-10-17 16:18:44 +0000 | |
| commit | 3962c485f814f1ef9c01f73c0765fb24c14babb5 (patch) | |
| tree | e94791beb5ba6708bb0b51f6014f7ef07e892b5b | |
| parent | c00165b1b77011926f6abbd3464952a2e397f6d3 (diff) | |
AudioDeviceBroker: fix regression in isValidCommunicationDevice
Commit 1dea0dab introduced a regression were the verification that the
device is a sink (output) device was removed from
isValidCommunicationDevice method.
Bug: 247659585
Bug: 266067856
Test: atest AudioCommunicationDeviceTest
Change-Id: Ie55debfeac1de21ef73c4de0f190cc77fa3b02be
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceBroker.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 9cfac9af3991..eea3d3885b34 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -68,6 +68,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; @@ -496,8 +497,9 @@ public class AudioDeviceBroker { AudioDeviceInfo.TYPE_AUX_LINE }; - /*package */ static boolean isValidCommunicationDevice(AudioDeviceInfo device) { - return isValidCommunicationDeviceType(device.getType()); + /*package */ static boolean isValidCommunicationDevice(@NonNull AudioDeviceInfo device) { + Objects.requireNonNull(device, "device must not be null"); + return device.isSink() && isValidCommunicationDeviceType(device.getType()); } private static boolean isValidCommunicationDeviceType(int deviceType) { |