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

Commit 48c3919c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594,... 

Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release

Change-Id: I77a19de7476051b6f34fe14af00b28319ac9740e
parents 33ddf86e c9985e64

system/stack/btm/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { 
  /* Make sure we don't exceed max port range.

   * Stack reserves scn 1 for HFP, HSP we still do the correct way.

   */

  if ((scn >= BTM_MAX_SCN) || (scn == 1)) return false;

  if ((scn >= BTM_MAX_SCN) || (scn == 1) || (scn == 0)) return false;



  /* check if this port is available */

  if (!btm_cb.btm_scn[scn - 1]) {
@@ -1635,7 +1635,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { 
 ******************************************************************************/

bool BTM_FreeSCN(uint8_t scn) {

  BTM_TRACE_DEBUG("BTM_FreeSCN ");

  if (scn <= BTM_MAX_SCN) {

  if (scn <= BTM_MAX_SCN && scn > 0) {

    btm_cb.btm_scn[scn - 1] = false;

    return (true);

  } else {