Merge "Add an override for entering sniff mode after idle on FTS and OTP" into lmp-dev
diff --git a/bta/dm/bta_dm_cfg.c b/bta/dm/bta_dm_cfg.c
index aea6fb8..62ce9c6 100644
--- a/bta/dm/bta_dm_cfg.c
+++ b/bta/dm/bta_dm_cfg.c
@@ -295,7 +295,7 @@
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* app close */
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco open */
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco close */
- {{BTA_DM_PM_SNIFF_A2DP_IDX, 7000}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */
+ {{BTA_DM_PM_SNIFF_A2DP_IDX, BTA_FTS_OPS_IDLE_TO_SNIFF_DELAY_MS}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */
{{BTA_DM_PM_ACTIVE, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */
}
diff --git a/include/bt_target.h b/include/bt_target.h
index 6d40997..4239cc7 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -317,6 +317,12 @@
#define BTIF_DM_OOB_TEST TRUE
#endif
+// How long to wait before activating sniff mode after entering the
+// idle state for FTS, OPS connections
+#ifndef BTA_FTS_OPS_IDLE_TO_SNIFF_DELAY_MS
+#define BTA_FTS_OPS_IDLE_TO_SNIFF_DELAY_MS 7000
+#endif
+
//------------------End added from bdroid_buildcfg.h---------------------
@@ -3327,7 +3333,6 @@
#define SAP_SERVER_INCLUDED FALSE
#endif
-
/*************************************************************************
* A2DP Definitions
*/
@@ -3784,4 +3789,3 @@
#include "bt_trace.h"
#endif /* BT_TARGET_H */
-