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

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

Merge changes from topic "314331379-fix-tm-dev" into tm-dev am: d477f5ed am:... 

Merge changes from topic "314331379-fix-tm-dev" into tm-dev am: d477f5ed am: 64af447d am: a19abc1f am: 238ae064 am: 45bbe38b

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



Change-Id: Iefa78c59833af32910b4b228bd2c6b625bfe093e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e32e659c 45bbe38b

system/stack/btu/btu_hcif.cc

+14 −0
Original line number Diff line number Diff line
@@ -918,6 +918,20 @@ static void read_encryption_key_size_complete_after_encryption_change(uint8_t st 
    return;

  }



  if (btm_sec_is_session_key_size_downgrade(handle, key_size)) {

    LOG_ERROR(

        "encryption key size lower than cached value, disconnecting. "

        "handle: 0x%x attempted key size: %d",

        handle, key_size);

    acl_disconnect_from_handle(

        handle, HCI_ERR_HOST_REJECT_SECURITY,

        "stack::btu::btu_hcif::read_encryption_key_size_complete_after_"

        "encryption_change Key Size Downgrade");

    return;

  }



  btm_sec_update_session_key_size(handle, key_size);



  // good key size - succeed

  btm_acl_encrypt_change(handle, static_cast<tHCI_STATUS>(status),

                         1 /* enable */);