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

Commit 1563c358 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Fix bad encryption status logged" into main am: 2c4b41a6 

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



Change-Id: I6dfd93b4a7ada9d2ac328fa7ff607574d346e7f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c295d4d 2c4b41a6

system/stack/btm/btm_sec.cc

+3 −2
Original line number Diff line number Diff line
@@ -3241,8 +3241,9 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, uint8_t encr_en 
    }

  }



  const bool is_encrypted =

          p_dev_rec->sec_rec.is_le_device_encrypted() || p_dev_rec->sec_rec.is_device_encrypted();

  const bool is_encrypted = (transport == BT_TRANSPORT_LE)

                                    ? p_dev_rec->sec_rec.is_le_device_encrypted()

                                    : p_dev_rec->sec_rec.is_device_encrypted();

  BTM_LogHistory(

          kBtmLogTag,

          (transport == BT_TRANSPORT_LE) ? p_dev_rec->ble.pseudo_addr : p_dev_rec->bd_addr,