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

Commit e57f307b authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Drop connection when atttempting to disable encryption am: 8c63c7c1 am: fb8ad6f5 

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



Change-Id: Ib7a386f2feb6ea03cdf8fe943c67e74eeaf08646
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2231c8fb fb8ad6f5

system/stack/acl/btm_acl.cc

+15 −0
Original line number Diff line number Diff line
@@ -630,6 +630,21 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
    return;

  }



  /* if we are trying to drop encryption on an encrypted connection, drop the

   * connection */

  if (p->is_encrypted && !encr_enable) {

    android_errorWriteLog(0x534e4554, "251436534");

    LOG(ERROR) << __func__

               << " attempting to decrypt encrypted connection, disconnecting. "

                  "handle: "

               << loghex(handle);



    acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,

                               "stack::btu::btu_hcif::read_drop_encryption "

                               "Connection Already Encrypted");

    return;

  }



  p->is_encrypted = encr_enable;



  /* Process Role Switch if active */