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

Commit 57fdebf1 authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Increase the stack start timeout to 12 seconds" into main am:... 

Merge "Floss: Increase the stack start timeout to 12 seconds" into main am: eaf46219 am: 57628423

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



Change-Id: I216d2d90c7776c15fd71ea32e1ed7baebdc8a746
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78573763 57628423

system/gd/os/chromeos/system_properties.cc

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ std::mutex properties_mutex; 
// Properties set along with some default values for Floss.

std::unordered_map<std::string, std::string> properties = {

        {"bluetooth.profile.avrcp.target.enabled", "true"},

};

        {"bluetooth.gd.start_timeout", "12000"}};

}  // namespace



std::optional<std::string> GetSystemProperty(const std::string& property) {

system/gd/os/linux/system_properties.cc

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ std::mutex properties_mutex; 
// Properties set along with some default values for Floss.

std::unordered_map<std::string, std::string> properties = {

        {"bluetooth.profile.avrcp.target.enabled", "true"},

};

        {"bluetooth.gd.start_timeout", "12000"}};

}  // namespace



std::optional<std::string> GetSystemProperty(const std::string& property) {