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

Commit 8ef15f7b authored by Alistair Delva's avatar Alistair Delva Committed by Gerrit Code Review
Browse files

Merge "Use treble-compliant property names in rootcanal"

parents c791983a e6cc9623

system/test/rootcanal/bluetooth_hci.cc

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ namespace { 


bool BtTestConsoleEnabled() {

  // Assume enabled by default.

  return property_get_bool("bt.rootcanal_test_console", true);

  return property_get_bool("vendor.bt.rootcanal_test_console", true);

}



}  // namespace
@@ -104,7 +104,7 @@ Return<void> BluetoothHci::initialize_impl( 
  controller_ = std::make_shared<DualModeController>();



  char mac_property[PROPERTY_VALUE_MAX] = "";

  property_get("bt.rootcanal_mac_address", mac_property, "3C:5A:B4:01:02:03");

  property_get("vendor.bt.rootcanal_mac_address", mac_property, "3C:5A:B4:01:02:03");

  controller_->Initialize({"dmc", std::string(mac_property)});



  controller_->RegisterEventChannel(