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

Commit 638bc018 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Flag 24Q3: load_did_config_from_sysprops am: 49632c1d 

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



Change-Id: Id589d56125e999fe2a804e36108c7fab72126be9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32a31a12 49632c1d

flags/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ aconfig_declarations { 
        "btm_ble.aconfig",

        "connectivity.aconfig",

        "device_iot_config.aconfig",

        "did.aconfig",

        "dis.aconfig",

        "dumpsys.aconfig",

        "framework.aconfig",

flags/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ aconfig("bluetooth_flags_c_lib") { 
    "btm_ble.aconfig",

    "connectivity.aconfig",

    "device_iot_config.aconfig",

    "did.aconfig",

    "dis.aconfig",

    "dumpsys.aconfig",

    "framework.aconfig",

flags/did.aconfig

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "load_did_config_from_sysprops"

    namespace: "bluetooth"

    description: "Replace bt_did.config by sysprops"

    bug: "327667978"

}

system/btif/include/btif_common.h

+0 −2
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ void btif_adapter_properties_evt(bt_status_t status, uint32_t num_props, bt_prop 
void btif_remote_properties_evt(bt_status_t status, RawAddress* remote_addr, uint32_t num_props,

                                bt_property_t* p_props);



void bte_load_did_conf(const char* p_path);



bt_status_t btif_transfer_context(tBTIF_CBACK* p_cback, uint16_t event, char* p_params,

                                  int param_len, tBTIF_COPY_CBACK* p_copy_cback);

system/btif/src/btif_core.cc

+15 −20
Original line number Diff line number Diff line
@@ -207,12 +207,8 @@ void btif_enable_bluetooth_evt() { 


  GetInterfaceToProfiles()->onBluetoothEnabled();



  if (!com::android::bluetooth::flags::load_did_config_from_sysprops()) {

    bte_load_did_conf(BTE_DID_CONF_FILE);

  } else {

  tSDP_DI_RECORD record = {

            .vendor =

                    uint16_t(android::sysprop::bluetooth::DeviceIDProperties::vendor_id().value_or(

          .vendor = uint16_t(android::sysprop::bluetooth::DeviceIDProperties::vendor_id().value_or(

                  LMP_COMPID_GOOGLE)),

          .vendor_id_source = uint16_t(

                  android::sysprop::bluetooth::DeviceIDProperties::vendor_id_source().value_or(
@@ -227,7 +223,6 @@ void btif_enable_bluetooth_evt() { 
  if (status != BTA_SUCCESS) {

    log::error("unable to set device ID record error {}.", bta_status_text(status));

  }

  }



  btif_dm_load_local_oob();