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

Commit 36bc93fa authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove sdp_serialization 

Bug: 251328572
Fixes: 290846397
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Ie057371ef91a1bdd9a1853cf9732811aff99c90f
parent 4dd601cc

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

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +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,

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +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;

system/stack/sdp/sdp_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,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 {