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

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

Merge "Add sysprop to configure auto flush timeout" into main am: f441460b 

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



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

system/gd/sysprops/sysprops_module.cc

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ void SyspropsModule::parse_config(std::string file_path) { 
          "bluetooth.core.classic.sniff_min_intervals",

          "bluetooth.core.classic.sniff_attempts",

          "bluetooth.core.classic.sniff_timeouts",

          "bluetooth.core.classic.auto_flush_timeout",

          // LE

          "bluetooth.core.le.min_connection_interval",

          "bluetooth.core.le.max_connection_interval",

system/stack/acl/btm_acl.cc

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ 
#define PROPERTY_LINK_SUPERVISION_TIMEOUT "bluetooth.core.acl.link_supervision_timeout"

#endif



#ifndef PROPERTY_AUTO_FLUSH_TIMEOUT

#define PROPERTY_AUTO_FLUSH_TIMEOUT "bluetooth.core.classic.auto_flush_timeout"

#endif



using namespace bluetooth;

using bluetooth::legacy::hci::GetInterface;
@@ -185,6 +189,10 @@ void NotifyAclRoleSwitchComplete(const RawAddress& bda, tHCI_ROLE new_role, 
void NotifyAclFeaturesReadComplete(tACL_CONN& p_acl, uint8_t max_page_number) {

  btm_process_remote_ext_features(&p_acl, max_page_number);

  btm_set_link_policy(&p_acl, btm_cb.acl_cb_.DefaultLinkPolicy());

  int32_t flush_timeout = osi_property_get_int32(PROPERTY_AUTO_FLUSH_TIMEOUT, 0);

  if (flush_timeout != 0) {

    acl_write_automatic_flush_timeout(p_acl.remote_addr, static_cast<uint16_t>(flush_timeout));

  }

  BTA_dm_notify_remote_features_complete(p_acl.remote_addr);

}