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

Commit 7d23cde9 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes Iaaaaa015,Ie057371e into main 

* changes:
  InitFlags: Remove sdp_skip_rnr_if_known
  InitFlags: Remove sdp_serialization
parents 461c4c76 68eda460

system/bta/dm/bta_dm_device_search.cc

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "bta/dm/bta_dm_device_search_int.h"

#include "bta/dm/bta_dm_disc_legacy.h"

#include "common/circular_buffer.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "device/include/interop.h"

#include "main/shim/dumpsys.h"
@@ -512,8 +511,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) { 
    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()) {

  if (BTM_IsRemoteNameKnown(remote_bd_addr, transport)) {

    log::debug("Security record already known skipping read remote name peer:{}", remote_bd_addr);

    bta_dm_search_cb.name_discover_done = true;

  }

system/bta/dm/bta_dm_disc_legacy.cc

+1 −2
Original line number Diff line number Diff line
@@ -1160,8 +1160,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) { 
    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()) {

  if (BTM_IsRemoteNameKnown(remote_bd_addr, transport)) {

    log::debug("Security record already known skipping read remote name peer:{}", remote_bd_addr);

    bta_dm_search_cb.name_discover_done = true;

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ init_flags!( 
        classic_discovery_only,

        dynamic_avrcp_version_enhancement = true,

        hci_adapter: i32,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

        set_min_encryption = true,

        subrating = true,

        use_unified_connection_manager,

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

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ mod ffi { 
        fn classic_discovery_only_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn get_hci_adapter() -> i32;

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

        fn set_min_encryption_is_enabled() -> bool;

        fn subrating_is_enabled() -> bool;

        fn use_unified_connection_manager_is_enabled() -> bool;

system/stack/sdp/sdp_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ tCONN_CB* sdp_conn_originate(const RawAddress& bd_addr) { 
  p_ccb->device_address = bd_addr;



  /* Transition to the next appropriate state, waiting for connection confirm */

  if (!bluetooth::common::init_flags::sdp_serialization_is_enabled() || cid == 0) {

  if (cid == 0) {

    p_ccb->con_state = tSDP_STATE::CONN_SETUP;

    cid = L2CA_ConnectReqWithSecurity(BT_PSM_SDP, bd_addr, BTM_SEC_NONE);

  } else {