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

Commit a44d063c authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Convert the type tA2DP_STATUS into an enum" into main am: ae4c4168 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3073885



Change-Id: Idbc8b046ccb4fc84d59db95179efbdd713472af7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75491773 ae4c4168

system/audio_hal_interface/aidl/a2dp_encoding_aidl.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ get_a2dp_configuration( 
 * received from the peer and decide whether accept

 * the it or not.

 ***/

uint8_t parse_a2dp_configuration(

tA2DP_STATUS parse_a2dp_configuration(

    btav_a2dp_codec_index_t codec_index, const uint8_t* codec_info,

    btav_a2dp_codec_config_t* codec_parameters,

    std::vector<uint8_t>* vendor_specific_parameters);

system/stack/a2dp/a2dp_aac.cc

+2 −1
Original line number Diff line number Diff line
@@ -608,7 +608,8 @@ std::string A2DP_CodecInfoStringAac(const uint8_t* p_codec_info) { 


  a2dp_status = A2DP_ParseInfoAac(&aac_cie, p_codec_info, true);

  if (a2dp_status != A2DP_SUCCESS) {

    res << "A2DP_ParseInfoAac fail: " << loghex(a2dp_status);

    res << "A2DP_ParseInfoAac fail: "

        << loghex(static_cast<uint8_t>(a2dp_status));

    return res.str();

  }

system/stack/a2dp/a2dp_sbc.cc

+2 −1
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ std::string A2DP_CodecInfoStringSbc(const uint8_t* p_codec_info) { 


  a2dp_status = A2DP_ParseInfoSbc(&sbc_cie, p_codec_info, true);

  if (a2dp_status != A2DP_SUCCESS) {

    res << "A2DP_ParseInfoSbc fail: " << loghex(a2dp_status);

    res << "A2DP_ParseInfoSbc fail: "

        << loghex(static_cast<uint8_t>(a2dp_status));

    return res.str();

  }

system/stack/a2dp/a2dp_vendor_aptx.cc

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,8 @@ std::string A2DP_VendorCodecInfoStringAptx(const uint8_t* p_codec_info) { 


  a2dp_status = A2DP_ParseInfoAptx(&aptx_cie, p_codec_info, true);

  if (a2dp_status != A2DP_SUCCESS) {

    res << "A2DP_ParseInfoAptx fail: " << loghex(a2dp_status);

    res << "A2DP_ParseInfoAptx fail: "

        << loghex(static_cast<uint8_t>(a2dp_status));

    return res.str();

  }

system/stack/a2dp/a2dp_vendor_aptx_hd.cc

+2 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ std::string A2DP_VendorCodecInfoStringAptxHd(const uint8_t* p_codec_info) { 


  a2dp_status = A2DP_ParseInfoAptxHd(&aptx_hd_cie, p_codec_info, true);

  if (a2dp_status != A2DP_SUCCESS) {

    res << "A2DP_ParseInfoAptxHd fail: " << loghex(a2dp_status);

    res << "A2DP_ParseInfoAptxHd fail: "

        << loghex(static_cast<uint8_t>(a2dp_status));

    return res.str();

  }