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

Commit 38c3073c authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes I06a707f3,I51fa3c2b,I5361fa3c,I8e0c9e90,I82bdc038, ... into main... 

Merge changes I06a707f3,I51fa3c2b,I5361fa3c,I8e0c9e90,I82bdc038, ... into main am: 1fba8323 am: cd309f5c am: 5134155a am: 93363c24

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2786430



Change-Id: Idd00ead71edf607ce510e64a51d6a3d328df4dce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents baf52cef 93363c24

system/btif/src/profile_log_levels.cc

+1 −8
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "avrc_api.h"

#include "avrc_api.h"

#include "bta_api.h"

#include "bta_api.h"

#include "btm_api.h"

#include "btm_api.h"

#include "btu.h"

#include "l2c_api.h"

#include "l2c_api.h"

#include "osi/include/config.h"

#include "osi/include/config.h"

#include "osi/include/log.h"

#include "osi/include/log.h"
@@ -58,7 +57,7 @@ 




static uint8_t BTAPP_SetTraceLevel(uint8_t new_level);

static uint8_t BTAPP_SetTraceLevel(uint8_t new_level);

static uint8_t BTIF_SetTraceLevel(uint8_t new_level);

static uint8_t BTIF_SetTraceLevel(uint8_t new_level);

static uint8_t BTU_SetTraceLevel(uint8_t new_level);

static uint8_t BTU_SetTraceLevel(uint8_t new_level) { return new_level; }





/* make sure list is order by increasing layer id!!! */

/* make sure list is order by increasing layer id!!! */

static tBTTRC_FUNC_MAP bttrc_set_level_map[] = {

static tBTTRC_FUNC_MAP bttrc_set_level_map[] = {
@@ -121,12 +120,6 @@ static uint8_t BTIF_SetTraceLevel(uint8_t new_level) { 
  return btif_trace_level;

  return btif_trace_level;

}

}





static uint8_t BTU_SetTraceLevel(uint8_t new_level) {

  if (new_level != 0xFF) btu_trace_level = new_level;



  return btu_trace_level;

}



void load_levels_from_config(const config_t* config) {

void load_levels_from_config(const config_t* config) {

  CHECK(config != NULL);

  CHECK(config != NULL);

system/btif/test/btif_core_test.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ void set_hal_cbacks(bt_callbacks_t* callbacks); 




uint8_t appl_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t appl_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btif_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btif_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btu_trace_level = BT_TRACE_LEVEL_DEBUG;





const tBTA_AG_RES_DATA tBTA_AG_RES_DATA::kEmpty = {};

const tBTA_AG_RES_DATA tBTA_AG_RES_DATA::kEmpty = {};

system/btif/test/btif_hh_test.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ void set_hal_cbacks(bt_callbacks_t* callbacks); 




uint8_t appl_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t appl_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btif_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btif_trace_level = BT_TRACE_LEVEL_DEBUG;

uint8_t btu_trace_level = BT_TRACE_LEVEL_DEBUG;





module_t bt_utils_module;

module_t bt_utils_module;

module_t gd_controller_module;

module_t gd_controller_module;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -378,7 +378,6 @@ init_flags!( 
        irk_rotation,

        irk_rotation,

        leaudio_targeted_announcement_reconnection_mode = true,

        leaudio_targeted_announcement_reconnection_mode = true,

        leaudio_enable_health_based_actions,

        leaudio_enable_health_based_actions,

        pass_phy_update_callback = true,

        pbap_pse_dynamic_version_upgrade = false,

        pbap_pse_dynamic_version_upgrade = false,

        periodic_advertising_adi = true,

        periodic_advertising_adi = true,

        private_gatt = true,

        private_gatt = true,

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

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

        fn irk_rotation_is_enabled() -> bool;

        fn leaudio_targeted_announcement_reconnection_mode_is_enabled() -> bool;

        fn leaudio_targeted_announcement_reconnection_mode_is_enabled() -> bool;

        fn leaudio_enable_health_based_actions_is_enabled() -> bool;

        fn leaudio_enable_health_based_actions_is_enabled() -> bool;

        fn pass_phy_update_callback_is_enabled() -> bool;

        fn pbap_pse_dynamic_version_upgrade_is_enabled() -> bool;

        fn pbap_pse_dynamic_version_upgrade_is_enabled() -> bool;

        fn periodic_advertising_adi_is_enabled() -> bool;

        fn periodic_advertising_adi_is_enabled() -> bool;

        fn private_gatt_is_enabled() -> bool;

        fn private_gatt_is_enabled() -> bool;