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

Commit 487e57db authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "floss: Modify A2dpCodecConfig::IsSinkCodecSupported to return... 

Merge "floss: Modify A2dpCodecConfig::IsSinkCodecSupported to return tA2DP_STATUS" into main am: a9095328 am: d005e424

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



Change-Id: I04c273e5fabf4dce75b486832c0cfbb5d4ff7dee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43653f8e d005e424

system/stack/a2dp/a2dp_vendor_ldac_linux.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,8 +20,8 @@ 




bool A2DP_IsCodecValidLdac(const uint8_t* p_codec_info) { return false; }

bool A2DP_IsCodecValidLdac(const uint8_t* p_codec_info) { return false; }





bool A2DP_IsVendorSinkCodecSupportedLdac(const uint8_t* p_codec_info) {

tA2DP_STATUS A2DP_IsVendorSinkCodecSupportedLdac(const uint8_t* p_codec_info) {

  return false;

  return A2DP_NOT_SUPPORTED_CODEC_TYPE;

}

}





bool A2DP_VendorUsesRtpHeaderLdac(bool content_protection_enabled,

bool A2DP_VendorUsesRtpHeaderLdac(bool content_protection_enabled,

system/stack/a2dp/a2dp_vendor_opus_linux.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 




bool A2DP_IsCodecValidOpus(const uint8_t* p_codec_info) { return false; }

bool A2DP_IsCodecValidOpus(const uint8_t* p_codec_info) { return false; }





bool A2DP_IsVendorSinkCodecSupportedOpus(const uint8_t* p_codec_info) {

tA2DP_STATUS A2DP_IsVendorSinkCodecSupportedOpus(const uint8_t* p_codec_info) {

  return false;

  return A2DP_NOT_SUPPORTED_CODEC_TYPE;

}

}





bool A2DP_VendorUsesRtpHeaderOpus(bool content_protection_enabled,

bool A2DP_VendorUsesRtpHeaderOpus(bool content_protection_enabled,