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

Commit e6cc9623 authored by Alistair Delva's avatar Alistair Delva
Browse files

Use treble-compliant property names in rootcanal

Properties set by vendor init should use the 'vendor.' namespace.

Bug: 157958356
Tag: #compatibility
Test: lunch cf_x86_phone-userdebug && launch_cvd
Change-Id: Ia022c0946623389ed6c7a9ad61832e6e358145ba
parent 2a4281f6
Loading
Loading
Loading
Loading
+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(