commit 125aae9165d292b089c5d2ed13ecdb0c5011d476
author Jakub Pawlowski <jpawlowski@google.com> Wed Sep 25 13:39:33 2019 +0200
committer Jakub Pawlowski <jpawlowski@google.com> Thu Sep 26 10:53:59 2019 +0200
tree 5a1050519c7613e0c228d3ffd93b99874081133c
parent 00da46a7a511860580e19dae52b1850b98c706cc

btm_ble_conn_complete: use pseudo address type together with pseudo address

Currently, when the pseudo address type doesn't match the received address
type, we can end up modifying the security record with bad address type
in call to btm_ble_connected.

Bug: 141186673
Bug: 139825901
Bug: 140847046
Change-Id: I7ea60dde6e0876a5e757006024490a2cc155a370
(cherry picked from commit c664929ed00cb38ad176b96a93a4071331607e15)

stack/btm/btm_ble_connection_establishment.cc

diff --git a/stack/btm/btm_ble_connection_establishment.cc b/stack/btm/btm_ble_connection_establishment.cc
index c0d7791..77bc00f 100644
--- a/stack/btm/btm_ble_connection_establishment.cc
+++ b/stack/btm/btm_ble_connection_establishment.cc
@@ -159,6 +159,7 @@
         if (!btm_ble_init_pseudo_addr(match_rec, bda)) {
           /* assign the original address to be the current report address */
           bda = match_rec->ble.pseudo_addr;
+          bda_type = match_rec->ble.ble_addr_type;
         } else {
           bda = match_rec->bd_addr;
         }