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

Commit bd2083df authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz Committed by Gerrit Code Review
Browse files

Merge changes from topic "debug_enhancements" 

* changes:
  SnoopLogger: Debug enhancements feature flag
  SnoopLogger: Debug enhancements
parents 454f6e4e 1e806ab9

system/bta/av/bta_av_aact.cc

+9 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,11 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
        .edr = 0,

        .sep = AVDT_TSEP_INVALID,

    };



    if (p_scb) {

      L2CA_SetMediaStreamChannel(p_scb->l2c_cid, true);

    }



    p = BTM_ReadRemoteFeatures(p_scb->PeerAddress());

    if (p != NULL) {

      if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_2MBPS;
@@ -2474,6 +2479,10 @@ void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    BTM_default_unblock_role_switch();

  }



  if (p_scb) {

    L2CA_SetMediaStreamChannel(p_scb->l2c_cid, false);

  }



  if (p_scb->open_status != BTA_AV_SUCCESS) {

    /* must be failure when opening the stream */

    data.open.bd_addr = p_scb->PeerAddress();

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ table InitFlagsData { 
    gatt_robust_caching_client_is_enabled:bool (privacy:"Any");

    gatt_robust_caching_server_is_enabled:bool (privacy:"Any");

    gd_core_is_enabled:bool (privacy:"Any");

    gd_hal_snoop_logger_filtering_is_enabled:bool (privacy:"Any");

    gd_hal_snoop_logger_socket_is_enabled:bool (privacy:"Any");

    gd_l2cap_is_enabled:bool (privacy:"Any");

    gd_link_policy_is_enabled:bool (privacy:"Any");

system/gd/common/init_flags.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ class InitFlags final { 
    return init_flags::gd_hal_snoop_logger_socket_is_enabled();

  }



  inline static bool IsSnoopLoggerFilteringEnabled() {

    return init_flags::gd_hal_snoop_logger_filtering_is_enabled();

  }



  inline static bool IsTargetedAnnouncementReconnectionMode() {

    return init_flags::leaudio_targeted_announcement_reconnection_mode_is_enabled();

  }

system/gd/common/init_flags_test.cc

+6 −0
Original line number Diff line number Diff line
@@ -86,3 +86,9 @@ TEST(InitFlagsTest, test_device_iot_config_logging_is_enabled) { 
  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::IsDeviceIotConfigLoggingEnabled());

}



TEST(InitFlagsTest, test_enable_snoop_logger_filtering) {

  const char* input[] = {"INIT_gd_hal_snoop_logger_filtering=true", nullptr};

  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::IsSnoopLoggerFilteringEnabled());

}
 
 No newline at end of file

system/gd/dumpsys/init_flags.cc

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
      initFlags::device_iot_config_logging_is_enabled());

  builder.add_dynamic_avrcp_version_enhancement_is_enabled(

      initFlags::dynamic_avrcp_version_enhancement_is_enabled());

  builder.add_gd_hal_snoop_logger_filtering_is_enabled(

      bluetooth::common::init_flags::gd_hal_snoop_logger_filtering_is_enabled());

  builder.add_finite_att_timeout_is_enabled(initFlags::finite_att_timeout_is_enabled());

  builder.add_gatt_robust_caching_client_is_enabled(initFlags::gatt_robust_caching_client_is_enabled());

  builder.add_gatt_robust_caching_server_is_enabled(initFlags::gatt_robust_caching_server_is_enabled());