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

Commit cef1de02 authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove sdp_return_classic_services_when_le_discovery_fails 

Bug: 278804760
Fixes: 290846502
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Ifb06d3266f757ed0557bd2e3518426b639d256b6
parent 19c133b9

system/btif/src/btif_dm.cc

+2 −12
Original line number Diff line number Diff line
@@ -1781,21 +1781,11 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, 
      return;

    }



    if (lea_supported) {

      if (bluetooth::common::init_flags::

                  sdp_return_classic_services_when_le_discovery_fails_is_enabled()) {

        log::info("Will return Classic SDP results, if done, to unblock bonding");

      } else {

        // LEA device w/o this flag

        // TODO: we might want to remove bond or do some action on

        // half-discovered device

        log::warn("No GATT service found for the LE Audio device {}", bd_addr);

        return;

      }

    } else {

    if (!lea_supported) {

      log::info("LE audio not supported, no need to report any UUIDs");

      return;

    }

    log::info("Will return Classic SDP results, if done, to unblock bonding");

  }



  Uuid existing_uuids[BT_MAX_NUM_UUIDS] = {};

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

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

        hci_adapter: i32,

        use_unified_connection_manager,

        sdp_return_classic_services_when_le_discovery_fails = true,

        use_rsi_from_cached_inqiry_results = false,

        att_mtu_default: i32 = 517,

    }

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

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

        fn get_hci_adapter() -> i32;

        fn use_unified_connection_manager_is_enabled() -> bool;

        fn sdp_return_classic_services_when_le_discovery_fails_is_enabled() -> bool;

        fn use_rsi_from_cached_inqiry_results_is_enabled() -> bool;

        fn get_att_mtu_default() -> i32;

    }