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

Commit d937940c authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "BR/EDR link keys are not stored" into main am: b6cd44f2 am:... 

Merge "BR/EDR link keys are not stored" into main am: b6cd44f2 am: 261bd7be am: 1a64bc77 am: 003a88d9

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



Change-Id: Ib79e6a4ff99e8542af9d839ba4f1e7440fa7785c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2844c42f 003a88d9

system/btif/src/btif_storage.cc

+2 −2
Original line number Diff line number Diff line
@@ -880,8 +880,8 @@ bt_status_t btif_storage_add_bonded_device(RawAddress* remote_bd_addr, 
      btif_config_set_int(bdstr, BTIF_STORAGE_KEY_LINK_KEY_TYPE, (int)key_type);

  ret &=

      btif_config_set_int(bdstr, BTIF_STORAGE_KEY_PIN_LENGTH, (int)pin_length);

  ret &= btif_config_set_bin(bdstr, BTIF_STORAGE_KEY_LINK_KEY_TYPE,

                             link_key.data(), link_key.size());

  ret &= btif_config_set_bin(bdstr, BTIF_STORAGE_KEY_LINK_KEY, link_key.data(),

                             link_key.size());



  if (ret) {

    btif_storage_set_mode(remote_bd_addr);