aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Chataing <henrichataing@google.com>2023-04-26 18:42:46 +0000
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-05-18 19:09:03 +0000
commite7fd1e9917a65bff45326a2592537c1b185a2a97 (patch)
treeeee4765dadf7d47f5a845f5169730891f33f7f1f
parent33cd0f07cfdf69939a104218dc012f74be53438d (diff)
downloadnetsim-e7fd1e9917a65bff45326a2592537c1b185a2a97.tar.gz
RootCanal: Pass the configuration by value to HciDeviceandroid14-dev
The controller properties are loaded from file each time a connection is created at the moment, this change makes sure that the properties are read only once at boot time. Test: m netsimd Bug: 253525123 (cherry picked from https://android-review.googlesource.com/q/commit:a09425ce64a15bea51e1b684a99fa920d9f063be) Merged-In: Id79447531004291f69ab3ddd4438a7ecf0b1da5a Change-Id: Id79447531004291f69ab3ddd4438a7ecf0b1da5a
-rw-r--r--src/hci/bluetooth_facade.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/hci/bluetooth_facade.cc b/src/hci/bluetooth_facade.cc
index a823b321..c691d037 100644
--- a/src/hci/bluetooth_facade.cc
+++ b/src/hci/bluetooth_facade.cc
@@ -89,10 +89,8 @@ size_t phy_classic_index_;
bool mStarted = false;
std::shared_ptr<rootcanal::AsyncManager> mAsyncManager;
-
std::unique_ptr<SimTestModel> gTestModel;
-
-std::string controller_properties_ = "";
+rootcanal::ControllerProperties controller_properties_;
bool ChangedState(model::State a, model::State b) {
return (b != model::State::UNKNOWN && a != b);