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

Commit 05b5648b authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "snoop_logger: Add support for logging to a socket" am: 10bf923d 

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



Change-Id: Ice6d1d6392dff3fe35e3d574e1b66268ccf2aef5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 267df17c 10bf923d

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,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_socket_is_enabled:bool (privacy:"Any");

    gd_l2cap_is_enabled:bool (privacy:"Any");

    gd_link_policy_is_enabled:bool (privacy:"Any");

    gd_remote_name_request_is_enabled:bool (privacy:"Any");

system/gd/common/init_flags.h

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

  }



  inline static bool IsSnoopLoggerSocketEnabled() {

    return init_flags::gd_hal_snoop_logger_socket_is_enabled();

  }



  inline static int GetAdapterIndex() {

    return init_flags::get_hci_adapter();

  }

system/gd/common/init_flags_test.cc

+6 −0
Original line number Diff line number Diff line
@@ -68,3 +68,9 @@ TEST(InitFlagsTest, test_debug_logging_multiple_flags) { 
  ASSERT_FALSE(InitFlags::IsDebugLoggingEnabledForTag("Foo"));

  ASSERT_FALSE(InitFlags::IsDebugLoggingEnabledForAll());

}



TEST(InitFlagsTest, test_enable_snoop_logger_socket) {

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

  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::IsSnoopLoggerSocketEnabled());

}
 
 No newline at end of file

system/gd/dumpsys/init_flags.cc

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  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());

  builder.add_gd_core_is_enabled(initFlags::gd_core_is_enabled());

  builder.add_gd_hal_snoop_logger_socket_is_enabled(

      bluetooth::common::init_flags::gd_hal_snoop_logger_socket_is_enabled());

  builder.add_gd_l2cap_is_enabled(initFlags::gd_l2cap_is_enabled());

  builder.add_gd_link_policy_is_enabled(initFlags::gd_link_policy_is_enabled());

  builder.add_gd_remote_name_request_is_enabled(initFlags::gd_remote_name_request_is_enabled());

system/gd/hal/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ filegroup { 
    name: "BluetoothHalSources",

    srcs: [

        "snoop_logger.cc",

        "snoop_logger_socket.cc",

        "snoop_logger_socket_thread.cc",

        "syscall_wrapper_impl.cc",

    ],

}
@@ -18,6 +21,8 @@ filegroup { 
    name: "BluetoothHalTestSources",

    srcs: [

        "snoop_logger_test.cc",

        "snoop_logger_socket_test.cc",

        "snoop_logger_socket_thread_test.cc",

    ],

}