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

Commit cf1df252 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Drop connection when atttempting to disable encryption"" into... 

Merge "Revert "Drop connection when atttempting to disable encryption"" into tm-qpr-dev am: ee7c9192

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



Change-Id: I7062dc29de0d512be3b5c7f36275e50054612f93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3acbe52 ee7c9192

system/stack/acl/btm_acl.cc

+0 −14
Original line number Diff line number Diff line
@@ -630,20 +630,6 @@ 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) {

    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 */