Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d22fa1d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BtAudio: Fix SessionType mapping" am: b1ab40b8 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1955928

Change-Id: I9e56f33eed65d1120036cae10bc8338038e8791c
parents 0252bda2 b1ab40b8

bluetooth/audio/utils/aidl_session/HidlToAidlMiddleware.cpp

+5 −17
Original line number Original line Diff line number Diff line
@@ -93,16 +93,6 @@ std::unordered_map< 
    std::unordered_map<uint16_t, std::shared_ptr<PortStatusCallbacks_2_2>>>

    std::unordered_map<uint16_t, std::shared_ptr<PortStatusCallbacks_2_2>>>

    legacy_callback_table;

    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>

const static std::unordered_map<SessionType_2_1, SessionType>

    session_type_2_1_to_aidl_map{

    session_type_2_1_to_aidl_map{

        {SessionType_2_1::A2DP_SOFTWARE_ENCODING_DATAPATH,

        {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},

        {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(

inline SessionType from_session_type_2_1(

    const SessionType_2_1& session_type_hidl) {

    const SessionType_2_1& session_type_hidl) {

  auto it = session_type_2_1_to_aidl_map.find(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;

  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) {

inline HidlStatus to_hidl_status(const BluetoothAudioStatus& status) {

  switch (status) {

  switch (status) {

    case BluetoothAudioStatus::SUCCESS:

    case BluetoothAudioStatus::SUCCESS: