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

Commit d0e03d31 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Floss: Re-enable HFP indicators" into main

parents 562d3d52 b057c5bd

system/BUILD.gn

+0 −6
Original line number Original line Diff line number Diff line
@@ -119,12 +119,6 @@ config("target_defaults") { 
    "TARGET_FLOSS",

    "TARGET_FLOSS",

    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

    "FALLTHROUGH_INTENDED=[[clang::fallthrough]]",

    "FALLTHROUGH_INTENDED=[[clang::fallthrough]]",

    # BTIF_HF_FEATURES is not actually passed to btadapterd.

    # These features are hardcoded in system/btif/src/btif_hf.cc

    # BTA_AG_FEAT_ECS (Enhanced Call Status 0x040) |

    # BTA_AG_FEAT_CODEC (Codec Negotiation 0x200) |

    # BTA_AG_FEAT_UNAT (Codec Negotiation 0x20000)

    "BTIF_HF_FEATURES=0x00020240",

  ]

  ]





  if (!(defined(use.bt_nonstandard_codecs) && use.bt_nonstandard_codecs)) {

  if (!(defined(use.bt_nonstandard_codecs) && use.bt_nonstandard_codecs)) {

system/btif/src/btif_hf.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,8 @@ static uint32_t get_hf_features() { 
          DEFAULT_BTIF_HF_FEATURES);

          DEFAULT_BTIF_HF_FEATURES);

  return hf_features;

  return hf_features;

#elif TARGET_FLOSS

#elif TARGET_FLOSS

  return BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT;

  return BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT |

         BTA_AG_FEAT_HF_IND;

#else

#else

  return DEFAULT_BTIF_HF_FEATURES;

  return DEFAULT_BTIF_HF_FEATURES;

#endif

#endif