diff --git a/audio/aidl/common/include/Utils.h b/audio/aidl/common/include/Utils.h index 305c92471e..652d63c01d 100644 --- a/audio/aidl/common/include/Utils.h +++ b/audio/aidl/common/include/Utils.h @@ -111,30 +111,6 @@ constexpr bool isTelephonyDeviceType( device == ::aidl::android::media::audio::common::AudioDeviceType::OUT_TELEPHONY_TX; } -constexpr bool isUsbInputDeviceType(::aidl::android::media::audio::common::AudioDeviceType type) { - switch (type) { - case ::aidl::android::media::audio::common::AudioDeviceType::IN_DOCK: - case ::aidl::android::media::audio::common::AudioDeviceType::IN_ACCESSORY: - case ::aidl::android::media::audio::common::AudioDeviceType::IN_DEVICE: - case ::aidl::android::media::audio::common::AudioDeviceType::IN_HEADSET: - return true; - default: - return false; - } -} - -constexpr bool isUsbOutputtDeviceType(::aidl::android::media::audio::common::AudioDeviceType type) { - switch (type) { - case ::aidl::android::media::audio::common::AudioDeviceType::OUT_DOCK: - case ::aidl::android::media::audio::common::AudioDeviceType::OUT_ACCESSORY: - case ::aidl::android::media::audio::common::AudioDeviceType::OUT_DEVICE: - case ::aidl::android::media::audio::common::AudioDeviceType::OUT_HEADSET: - return true; - default: - return false; - } -} - constexpr bool isValidAudioMode(::aidl::android::media::audio::common::AudioMode mode) { return std::find(kValidAudioModes.begin(), kValidAudioModes.end(), mode) != kValidAudioModes.end(); diff --git a/audio/aidl/default/usb/ModuleUsb.cpp b/audio/aidl/default/usb/ModuleUsb.cpp index ecdbd5cb77..28116ae533 100644 --- a/audio/aidl/default/usb/ModuleUsb.cpp +++ b/audio/aidl/default/usb/ModuleUsb.cpp @@ -30,13 +30,13 @@ extern "C" { #include "alsa_device_profile.h" } -using aidl::android::hardware::audio::common::isUsbInputDeviceType; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioDeviceAddress; using aidl::android::media::audio::common::AudioDeviceDescription; using aidl::android::media::audio::common::AudioDeviceType; using aidl::android::media::audio::common::AudioFormatDescription; using aidl::android::media::audio::common::AudioFormatType; +using aidl::android::media::audio::common::AudioIoFlags; using aidl::android::media::audio::common::AudioPort; using aidl::android::media::audio::common::AudioPortConfig; using aidl::android::media::audio::common::AudioPortExt; @@ -117,7 +117,7 @@ ndk::ScopedAStatus ModuleUsb::populateConnectedDevicePort(AudioPort* audioPort) return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); } - const bool isInput = isUsbInputDeviceType(devicePort.device.type.type); + const bool isInput = audioPort->flags.getTag() == AudioIoFlags::input; alsa_device_profile profile; profile_init(&profile, isInput ? PCM_IN : PCM_OUT); profile.card = alsaAddress[0];