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

Commit 1e0c61ce authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Drop support for controllers non supporting SSP" into main am: 50f7acaf am: c1021b02 

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



Change-Id: I7436b343b11838780e65b9db3411f16c3fa4bdca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c6c112a c1021b02

system/stack/btm/btm_sec.cc

+10 −12
Original line number Diff line number Diff line
@@ -2193,7 +2193,9 @@ void btm_sec_check_pending_reqs(void) { 
 *

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

void btm_sec_dev_reset(void) {

  if (controller_get_interface()->supports_simple_pairing()) {

  ASSERT_LOG(controller_get_interface()->supports_simple_pairing(),

             "only controllers with SSP is supported");



  /* set the default IO capabilities */

  btm_cb.devcb.loc_io_caps = btif_storage_get_local_io_caps();

  /* add mx service to use no security */
@@ -2201,10 +2203,6 @@ void btm_sec_dev_reset(void) { 
                       BTM_SEC_NONE, BT_PSM_RFCOMM, BTM_SEC_PROTO_RFCOMM, 0);

  BTM_SetSecurityLevel(true, "RFC_MUX", BTM_SEC_SERVICE_RFC_MUX, BTM_SEC_NONE,

                       BT_PSM_RFCOMM, BTM_SEC_PROTO_RFCOMM, 0);

  } else {

    btm_cb.security_mode = BTM_SEC_MODE_SERVICE;

  }



  BTM_TRACE_DEBUG("btm_sec_dev_reset sec mode: %d", btm_cb.security_mode);

}