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

Commit 457417f4 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "sysprop: Remove the wrapper GET_SYSPROP" into main

parents 187eec2b 3d28bf01

sysprop/exported_include/android_bluetooth_sysprop.h

+0 −3
Original line number Diff line number Diff line
@@ -22,6 +22,3 @@ 
#include <bta.sysprop.h>

#include <device_id.sysprop.h>

#include <hfp.sysprop.h>
 


#define GET_SYSPROP(namespace, prop, default) \

  android::sysprop::bluetooth::namespace ::prop().value_or(default)

system/bta/ag/bta_ag_swb_aptx.cc

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ using namespace bluetooth; 


bool is_hfp_aptx_voice_enabled() {

  return com::android::bluetooth::flags::hfp_codec_aptx_voice() &&

         GET_SYSPROP(Hfp, codec_aptx_voice, false);

         android::sysprop::bluetooth::Hfp::codec_aptx_voice().value_or(false);

}



static bool aptx_swb_codec_status;

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ void bta_dm_disable() { 
  if (BTM_GetNumAclLinks() == 0) {

    // Time to wait after receiving shutdown request to delay the actual

    // shutdown process. This time may be zero which invokes immediate shutdown.

    const uint64_t disable_delay_ms = GET_SYSPROP(Bta, disable_delay, 200);

    const uint64_t disable_delay_ms =

            android::sysprop::bluetooth::Bta::disable_delay().value_or(200);

    switch (disable_delay_ms) {

      case 0:

        log::debug("Immediately disabling device manager");

system/bta/hf_client/bta_hf_client_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -225,5 +225,6 @@ int get_default_hf_client_features() { 
   BTA_HF_CLIENT_FEAT_CLI | BTA_HF_CLIENT_FEAT_VREC | BTA_HF_CLIENT_FEAT_VOL | \

   BTA_HF_CLIENT_FEAT_ECS | BTA_HF_CLIENT_FEAT_ECC | BTA_HF_CLIENT_FEAT_CODEC)



  return GET_SYSPROP(Hfp, hf_client_features, DEFAULT_BTIF_HF_CLIENT_FEATURES);

  return android::sysprop::bluetooth::Hfp::hf_client_features().value_or(

          DEFAULT_BTIF_HF_CLIENT_FEATURES);

}

system/bta/hfp/bta_hfp_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
#include <android_bluetooth_sysprop.h>



int get_default_hfp_version() {

  return GET_SYSPROP(Hfp, version, HFP_VERSION_1_7);

  return android::sysprop::bluetooth::Hfp::version().value_or(HFP_VERSION_1_7);

}