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

Commit c7da85d3 authored by Whale Chang's avatar Whale Chang Committed by Automerger Merge Worker
Browse files

Merge "Floss: Disable three way call feature" into main am: 14c5f38c 

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



Change-Id: I2f650864991e44f110f80e023ceba79b15e8c62b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9683ed2 14c5f38c

system/btif/src/btif_hf.cc

+2 −3
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static tBTA_SERVICE_MASK get_BTIF_HF_SERVICES() { 
static uint32_t get_hf_features() {

#if TARGET_FLOSS

#define DEFAULT_BTIF_HF_FEATURES \

  (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT | \

   BTA_AG_FEAT_HF_IND)

  (BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT | BTA_AG_FEAT_HF_IND)

#else

#define DEFAULT_BTIF_HF_FEATURES                                  \

  (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT |     \