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

Commit 0b4c74ad authored by Ted Wang's avatar Ted Wang Committed by Automerger Merge Worker
Browse files

Revert "Drop connection when atttempting to disable encryption" am: 638e4875

parents 14fec89d 638e4875
Loading
Loading
Loading
Loading
+0 −15
Original line number Diff line number Diff line
@@ -630,21 +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) {
    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 */