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

Commit 288f71f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shim: Security module InitFlag" am: e32c5acc am: 980e1f44 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1416248

Change-Id: Iab6b29b254c6894a0bc4c6a2e2be98d14a96f495
parents be77db00 980e1f44

system/gd/common/init_flags.cc

+13 −2
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
namespace bluetooth {

namespace common {



const std::string kGdSecurityFlag = "INIT_gd_security";

bool InitFlags::gd_security_enabled = false;



const std::string kGdAclFlag = "INIT_gd_acl";

bool InitFlags::gd_acl_enabled = false;
@@ -45,6 +48,8 @@ void InitFlags::Load(const char** flags) { 
  while (flags != nullptr && *flags != nullptr) {

    if (kGdCoreFlag == *flags) {

      gd_core_enabled = true;

    } else if (kGdSecurityFlag == *flags) {

      gd_security_enabled = true;

    } else if (kGdAclFlag == *flags) {

      gd_acl_enabled = true;

    } else if (kGdHciFlag == *flags) {
@@ -57,7 +62,10 @@ void InitFlags::Load(const char** flags) { 
    flags++;

  }



  if (gd_core_enabled && !gd_acl_enabled) {

  if (gd_core_enabled && !gd_security_enabled) {

    gd_security_enabled = true;

  }

  if (gd_security_enabled && !gd_acl_enabled) {

    gd_acl_enabled = true;

  }

  if (gd_acl_enabled && !gd_controller_enabled) {
@@ -68,7 +76,9 @@ void InitFlags::Load(const char** flags) { 
  }



  LOG_INFO(

      "Flags loaded: gd_acl_enabled: %s, gd_hci_enabled: %s, gd_controller_enabled: %s, gd_core_enabled: %s",

      "Flags loaded: gd_security_enabled: %s, gd_acl_enabled: %s, gd_hci_enabled: %s, gd_controller_enabled: %s, "

      "gd_core_enabled: %s",

      gd_security_enabled ? "true" : "false",

      gd_acl_enabled ? "true" : "false",

      gd_hci_enabled ? "true" : "false",

      gd_controller_enabled ? "true" : "false",
@@ -78,6 +88,7 @@ void InitFlags::Load(const char** flags) { 
void InitFlags::SetAll(bool value) {

  gd_core_enabled = value;

  gd_acl_enabled = value;

  gd_security_enabled = value;

  gd_controller_enabled = value;

  gd_hci_enabled = value;

  gatt_robust_caching_enabled = value;

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ attribute "privacy"; 


table InitFlagsData {

    title:string;

    gd_security_enabled:bool;

    gd_acl_enabled:bool;

    gd_hci_enabled:bool;

    gd_controller_enabled:bool;

system/gd/common/init_flags.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ class InitFlags final { 
 public:

  static void Load(const char** flags);



  static bool GdSecurityEnabled() {

    return gd_security_enabled;

  }



  static bool GdAclEnabled() {

    return gd_acl_enabled;

  }
@@ -47,6 +51,7 @@ class InitFlags final { 


 private:

  static void SetAll(bool value);

  static bool gd_security_enabled;

  static bool gd_acl_enabled;

  static bool gd_hci_enabled;

  static bool gd_controller_enabled;

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  auto title = fb_builder->CreateString("----- Init Flags -----");

  common::InitFlagsDataBuilder builder(*fb_builder);

  builder.add_title(title);

  builder.add_gd_security_enabled(bluetooth::common::InitFlags::GdSecurityEnabled());

  builder.add_gd_acl_enabled(bluetooth::common::InitFlags::GdAclEnabled());

  builder.add_gd_hci_enabled(bluetooth::common::InitFlags::GdHciEnabled());

  builder.add_gd_controller_enabled(bluetooth::common::InitFlags::GdControllerEnabled());

system/main/shim/shim.cc

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ EXPORT_SYMBOL extern const module_t gd_shim_module = { 
    .clean_up = kUnusedModuleApi,

    .dependencies = {kUnusedModuleDependencies}};



bool bluetooth::shim::is_gd_security_enabled() {

  return bluetooth::common::InitFlags::GdSecurityEnabled();

}



bool bluetooth::shim::is_gd_acl_enabled() {

  return bluetooth::common::InitFlags::GdAclEnabled();

}