commit a2b637d25251e2bdeb1ac18a931f5d85f2a222e8
author android-build-team Robot <android-build-team-robot@google.com> Fri May 14 21:57:56 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 14 21:57:56 2021 +0000
tree 37f20c912d66df0be4b9da793a726ffbcf2363c0
parent 267820fd1bb2bf10bb02c0643ed0ef6e8592d8a4
parent 94468870262471420a44fc5107af663c3c08c955

Merge cherrypicks of [14554379, 14554380, 14554562, 14554565, 14554567, 14554524, 14554569, 14554525, 14554572, 14554574, 14554575, 14554577, 14554622, 14554628, 14554630, 14554631, 14554503, 14554632, 14554536, 14554633] into security-aosp-qt-release

Change-Id: Ieb24903d85c0a1a80e4b66e481e5a7f194fc300c

stack/btm/btm_acl.cc

diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index 694577d..090a0aa 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -1611,7 +1611,7 @@
   /* 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]) {
@@ -1633,7 +1633,7 @@
  ******************************************************************************/
 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 {