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

Commit 0915f945 authored by Fred Quintana's avatar Fred Quintana Committed by Android (Google) Code Review
Browse files

Merge "Add an override for entering sniff mode after idle on FTS and OTP" into lmp-dev

parents 2024f1a5 7db35a28

system/bta/dm/bta_dm_cfg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -295,7 +295,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{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}},    /* 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 open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{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_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

  }

system/include/bt_target.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -317,6 +317,12 @@ 
#define BTIF_DM_OOB_TEST  TRUE

#define BTIF_DM_OOB_TEST  TRUE

#endif

#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---------------------

//------------------End added from bdroid_buildcfg.h---------------------
@@ -3327,7 +3333,6 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF. 
#define SAP_SERVER_INCLUDED         FALSE

#define SAP_SERVER_INCLUDED         FALSE

#endif

#endif







/*************************************************************************

/*************************************************************************

 * A2DP Definitions

 * A2DP Definitions

 */

 */
@@ -3784,4 +3789,3 @@ The maximum number of payload octets that the local device can receive in a sing 
#include "bt_trace.h"

#include "bt_trace.h"





#endif /* BT_TARGET_H */
 
#endif /* BT_TARGET_H */