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

Commit bcc1832e authored by Chris Manton's avatar Chris Manton
Browse files

sdp: If known skip read remote name request 

Bug: 260598196
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I5ada864263503e809a6832a4f5bf8cdf100e090d
parent b0f8b79b

system/bta/dm/bta_dm_act.cc

+8 −0
Original line number Diff line number Diff line
@@ -1764,6 +1764,14 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
    /* Do not perform RNR for LE devices at inquiry complete*/

    bta_dm_search_cb.name_discover_done = true;

  }

  // If we already have the name we can skip getting the name

  if (BTM_IsRemoteNameKnown(remote_bd_addr, transport) &&

      bluetooth::common::init_flags::sdp_skip_rnr_if_known_is_enabled()) {

    LOG_DEBUG("Security record already known skipping read remote name peer:%s",

              PRIVATE_ADDRESS(remote_bd_addr));

    bta_dm_search_cb.name_discover_done = true;

  }



  /* if name discovery is not done and application needs remote name */

  if ((!bta_dm_search_cb.name_discover_done) &&

      ((bta_dm_search_cb.p_btm_inq_info == NULL) ||

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ table InitFlagsData { 
    pass_phy_update_callback_is_enabled:bool (privacy:"Any");

    redact_log_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

}

// LINT.ThenChange(/system/gd/dumpsys/init_flags.cc)

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_pass_phy_update_callback_is_enabled(initFlags::pass_phy_update_callback_is_enabled());

  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_sdp_serialization_is_enabled(initFlags::sdp_serialization_is_enabled());

  builder.add_sdp_skip_rnr_if_known_is_enabled(initFlags::sdp_skip_rnr_if_known_is_enabled());



  return builder.Finish();

}

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

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ init_flags!( 
        pass_phy_update_callback = true,

        redact_log = true,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

    }

    // extra_fields are not a 1 to 1 match with "INIT_*" flags

    extra_fields: {

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

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

        fn redact_log_is_enabled() -> bool;

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

    }

}