tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BtAudio: Fix SessionType mapping

Browse source 
Bug: 203490261
Test: m android.hardware.bluetooth.audio-V1-impl -j
Change-Id: I477e16e4fc060dd145828bca4aba5ad49a56ff76
This commit is contained in:
Josh Wu 2022-01-20 09:48:08 -08:00
parent aca34136be
commit ce6ca9eda7
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bluetooth/audio/utils/aidl_session/HidlToAidlMiddleware.cpp
View file

@ -93,16 +93,6 @@ std::unordered_map<
std::unordered_map<uint16_t, std::shared_ptr<PortStatusCallbacks_2_2>>>
legacy_callback_table;
const static std::unordered_map<SessionType_2_0, SessionType>
session_type_2_0_to_aidl_map{
{SessionType_2_0::A2DP_SOFTWARE_ENCODING_DATAPATH,
SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH},
{SessionType_2_0::A2DP_HARDWARE_OFFLOAD_DATAPATH,
SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH},
{SessionType_2_0::HEARING_AID_SOFTWARE_ENCODING_DATAPATH,
SessionType::HEARING_AID_SOFTWARE_ENCODING_DATAPATH},
};
const static std::unordered_map<SessionType_2_1, SessionType>
session_type_2_1_to_aidl_map{
{SessionType_2_1::A2DP_SOFTWARE_ENCODING_DATAPATH,
@ -218,13 +208,6 @@ const static std::unordered_map<LeAudioMode, LeAudioMode_2_2>
{LeAudioMode::BROADCAST, LeAudioMode_2_2::BROADCAST},
};
inline SessionType from_session_type_2_0(
const SessionType_2_0& session_type_hidl) {
auto it = session_type_2_0_to_aidl_map.find(session_type_hidl);
if (it != session_type_2_0_to_aidl_map.end()) return it->second;
return SessionType::UNKNOWN;
}
inline SessionType from_session_type_2_1(
const SessionType_2_1& session_type_hidl) {
auto it = session_type_2_1_to_aidl_map.find(session_type_hidl);
@ -232,6 +215,11 @@ inline SessionType from_session_type_2_1(
return SessionType::UNKNOWN;
}
inline SessionType from_session_type_2_0(
const SessionType_2_0& session_type_hidl) {
return from_session_type_2_1(static_cast<SessionType_2_1>(session_type_hidl));
}
inline HidlStatus to_hidl_status(const BluetoothAudioStatus& status) {
switch (status) {
case BluetoothAudioStatus::SUCCESS: