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

Commit 6cd3006e authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove bluetooth::shim::is_gd_link_policy_enabled am: 7f301d29 

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



Change-Id: I54a344ee8f03841e50ed5dea07aff5c682c8b3ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6570910 7f301d29

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,6 @@ init_flags!( 
        gatt_robust_caching_server,

        gatt_robust_caching_server,

        gd_core,

        gd_core,

        gd_l2cap,

        gd_l2cap,

        gd_link_policy,

        hci_adapter: i32,

        hci_adapter: i32,

        hfp_dynamic_version = true,

        hfp_dynamic_version = true,

        irk_rotation,

        irk_rotation,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ mod ffi { 
        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn gd_core_is_enabled() -> bool;

        fn gd_core_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gd_link_policy_is_enabled() -> bool;

        fn get_default_log_level() -> i32;

        fn get_default_log_level() -> i32;

        fn get_hci_adapter() -> i32;

        fn get_hci_adapter() -> i32;

        fn get_log_level_for_tag(tag: &str) -> i32;

        fn get_log_level_for_tag(tag: &str) -> i32;

system/main/shim/shim.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -61,10 +61,6 @@ EXPORT_SYMBOL extern const module_t gd_shim_module = { 
    .clean_up = kUnusedModuleApi,

    .clean_up = kUnusedModuleApi,

    .dependencies = {kUnusedModuleDependencies}};

    .dependencies = {kUnusedModuleDependencies}};





bool bluetooth::shim::is_gd_link_policy_enabled() {

  return bluetooth::common::init_flags::gd_link_policy_is_enabled();

}



bool bluetooth::shim::is_gd_l2cap_enabled() {

bool bluetooth::shim::is_gd_l2cap_enabled() {

  return bluetooth::common::init_flags::gd_l2cap_is_enabled();

  return bluetooth::common::init_flags::gd_l2cap_is_enabled();

}

}

system/main/shim/shim.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ namespace shim { 
 *

 *

 * @return true if using gd shim core, false if using legacy.

 * @return true if using gd shim core, false if using legacy.

 */

 */

bool is_gd_link_policy_enabled();

bool is_gd_l2cap_enabled();

bool is_gd_l2cap_enabled();

bool is_gd_shim_enabled();

bool is_gd_shim_enabled();

bool is_gd_btaa_enabled();

bool is_gd_btaa_enabled();

system/stack/acl/btm_pm.cc

+0 −6
Original line number Original line Diff line number Diff line
@@ -122,12 +122,6 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, 
 ******************************************************************************/

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

tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id,

tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id,

                           tBTM_PM_STATUS_CBACK* p_cb) {

                           tBTM_PM_STATUS_CBACK* p_cb) {

  if (bluetooth::shim::is_gd_link_policy_enabled()) {

    ASSERT(p_pm_id != nullptr);

    ASSERT(p_cb != nullptr);

    return BTM_NO_RESOURCES;

  }



  /* de-register */

  /* de-register */

  if (mask & BTM_PM_DEREG) {

  if (mask & BTM_PM_DEREG) {

    if (*p_pm_id >= BTM_MAX_PM_RECORDS) return BTM_ILLEGAL_VALUE;

    if (*p_pm_id >= BTM_MAX_PM_RECORDS) return BTM_ILLEGAL_VALUE;