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

Commit fb9e4fac authored by William Escande's avatar William Escande
Browse files

Add hfp sysprop for profile version 

The `define` cannot be override on runtime and some target need to
change the default version to use (Eg: Wear OS)

Bug: 263323082
Test: atest net_test_btif_hf_client_service net_test_bta
      net_test_btif_bta
Change-Id: Iee020f8029dc5f82564fa28574914096a8e7cd75
parent 5643875c

sysprop/hfp.sysprop

+8 −0
Original line number Diff line number Diff line
@@ -9,4 +9,12 @@ prop { 
    prop_name: "bluetooth.hfp.hf_services_mask.config"

}



prop {

    api_name: "version"

    type: Integer

    scope: Internal

    access: Readonly

    prop_name: "bluetooth.hfp.version.config"

}

system/bta/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ cc_library_static { 
        "hh/bta_hh_le.cc",

        "hh/bta_hh_main.cc",

        "hh/bta_hh_utils.cc",

        "hfp/bta_hfp_api.cc",

        "hd/bta_hd_act.cc",

        "hd/bta_hd_api.cc",

        "hd/bta_hd_main.cc",
@@ -130,6 +131,7 @@ cc_library_static { 
        "avrcp-target-service",

        "lib-bt-packets",

        "libbt-bta-core",

        "libcom.android.sysprop.bluetooth",

    ],

    generated_headers: [

        "LeAudioSetConfigSchemas_h",
@@ -215,6 +217,7 @@ cc_test { 
        "libbt-audio-hal-interface",

        "libbluetooth-types",

        "libbt-protos-lite",

        "libcom.android.sysprop.bluetooth",

        "libosi",

        "libbt-common",

    ],

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static_library("bta") { 
    "hh/bta_hh_le.cc",

    "hh/bta_hh_main.cc",

    "hh/bta_hh_utils.cc",

    "hfp/bta_hfp_api.cc",

    "hd/bta_hd_act.cc",

    "hd/bta_hd_api.cc",

    "hd/bta_hd_main.cc",

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ bool bta_ag_add_record(uint16_t service_uuid, const char* p_service_name, 
    if (bluetooth::common::init_flags::hfp_dynamic_version_is_enabled()) {

      version = HFP_VERSION_1_6;

    } else {

      version = BTA_HFP_VERSION;

      version = get_default_hfp_version();

    }

  } else {

    profile_uuid = UUID_SERVCLASS_HEADSET;

system/bta/hf_client/bta_hf_client_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ bool bta_hf_client_add_record(const char* p_service_name, uint8_t scn, 


  /* add profile descriptor list */

  profile_uuid = UUID_SERVCLASS_HF_HANDSFREE;

  version = BTA_HFP_VERSION;

  version = get_default_hfp_version();



  result &= SDP_AddProfileDescriptorList(sdp_handle, profile_uuid, version);