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

Commit 3bab14a8 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "InitFlags: Remove dynamic_avrcp_version_enhancement" into main

parents 81dce1b6 a949916e

system/bta/dm/bta_dm_disc.cc

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "bta/include/bta_gatt_api.h"

#include "com_android_bluetooth_flags.h"

#include "common/circular_buffer.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "internal_include/bt_target.h"

#include "main/shim/dumpsys.h"

system/bta/dm/bta_dm_disc_legacy.cc

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "btif/include/btif_config.h"

#include "com_android_bluetooth_flags.h"

#include "common/circular_buffer.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "device/include/interop.h"

#include "internal_include/bt_target.h"
@@ -674,8 +673,7 @@ static void bta_dm_sdp_result(tBTA_DM_SDP_RESULT& sdp_event) { 
      }

    } while (p_sdp_rec);



    if (bluetooth::common::init_flags::dynamic_avrcp_version_enhancement_is_enabled() &&

        bta_dm_search_cb.services_to_search == 0) {

    if (bta_dm_search_cb.services_to_search == 0) {

      bta_dm_store_audio_profiles_version();

    }

system/bta/dm/bta_dm_disc_sdp.cc

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

#include "btif/include/btif_config.h"

#include "com_android_bluetooth_flags.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "internal_include/bt_target.h"

#include "stack/include/bt_uuid16.h"
@@ -235,8 +234,7 @@ void bta_dm_sdp_result(tSDP_STATUS sdp_result, tBTA_DM_SDP_STATE* sdp_state) { 
      }

    } while (p_sdp_rec);



    if (bluetooth::common::init_flags::dynamic_avrcp_version_enhancement_is_enabled() &&

        sdp_state->services_to_search == 0) {

    if (sdp_state->services_to_search == 0) {

      bta_dm_store_audio_profiles_version(p_sdp_db);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ init_flags!( 
    name: InitFlags

    flags: {

        classic_discovery_only,

        dynamic_avrcp_version_enhancement = true,

        hci_adapter: i32,

        use_unified_connection_manager,

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ mod ffi { 
        fn dump() -> Vec<InitFlagWithValue>;



        fn classic_discovery_only_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn get_hci_adapter() -> i32;

        fn use_unified_connection_manager_is_enabled() -> bool;

    }