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

Commit ab8626ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L66900000959043608:N68200001345915916"... 

Merge changes from topic "cherrypicker-L66900000959043608:N68200001345915916" into tm-qpr-dev am: 8136b6b1

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



Change-Id: Ieaddbfc1574f000256609f76d5ceda71a1498801
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25b4211a 8136b6b1

sysprop/hfp.sysprop

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ prop { 
    prop_name: "bluetooth.hfp.hf_client_features.config"

}



prop {

    api_name: "hf_features"

    type: Integer

    scope: Internal

    access: Readonly

    prop_name: "bluetooth.hfp.hf_features.config"

}



prop {

    api_name: "hf_services"

    type: Integer

system/btif/src/btif_hf.cc

+21 −9
Original line number Diff line number Diff line
@@ -73,16 +73,9 @@ namespace headset { 
  { BTIF_HSAG_SERVICE_NAME, BTIF_HFAG_SERVICE_NAME }

#endif



#ifndef BTIF_HF_FEATURES

#define BTIF_HF_FEATURES                                          \

  (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT |     \

   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC |      \

   BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO_S4 | \

   BTA_AG_FEAT_UNAT)

#endif



static uint32_t get_hf_features();

/* HF features supported at runtime */

static uint32_t btif_hf_features = BTIF_HF_FEATURES;

static uint32_t btif_hf_features = get_hf_features();



#define BTIF_HF_INVALID_IDX (-1)
@@ -156,6 +149,25 @@ static tBTA_SERVICE_MASK get_BTIF_HF_SERVICES() { 
#endif

}



/* HF features supported at runtime */

static uint32_t get_hf_features() {

#define DEFAULT_BTIF_HF_FEATURES                                  \

  (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT |     \

   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC |      \

   BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO_S4 | \

   BTA_AG_FEAT_UNAT)

#ifdef OS_ANDROID

  static const uint32_t hf_features =

      android::sysprop::bluetooth::Hfp::hf_features().value_or(

          DEFAULT_BTIF_HF_FEATURES);

  return hf_features;

#elif TARGET_FLOSS

  return BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC;

#else

  return DEFAULT_BTIF_HF_FEATURES;

#endif

}



/*******************************************************************************

 *

 * Function         is_connected