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

Commit 6fd5f871 authored by Zhengping Jiang's avatar Zhengping Jiang
Browse files

floss: add identity address to accept list if ll privacy is enabled 

When ll privacy is enabled, the identity address should be added to the
accept list. Use the helper function to get the proper address.

Bug: 235218533
Bug: 307218612
Test: manual test reconnect/wakeup with a mouse using RPA
Test: mma -j32
Flag: EXEMPT Floss only changes. The code is tested in autotests.
Change-Id: Ic46efc221f72a27f2563bd9f1dc0c54f33daf887
parent c5aa82b5

system/main/shim/btm_api.cc

+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "main/shim/helpers.h"

#include "main/shim/stack.h"

#include "stack/btm/btm_ble_sec.h"

#include "stack/btm/btm_dev.h"

#include "types/raw_address.h"



uint16_t bluetooth::shim::BTM_GetHCIConnHandle(const RawAddress& remote_bda,
@@ -80,8 +81,9 @@ tBTM_STATUS bluetooth::shim::BTM_AllowWakeByHid( 
    std::promise<bool> accept_promise;

    auto accept_future = accept_promise.get_future();



    tBLE_BD_ADDR bdadr = BTM_Sec_GetAddressWithType(hid_address.first);

    Stack::GetInstance()->GetAcl()->AcceptLeConnectionFrom(

        ToAddressWithType(hid_address.first, hid_address.second),

        ToAddressWithType(bdadr.bda, bdadr.type),

        /*is_direct=*/false, std::move(accept_promise));



    accept_future.wait();
@@ -101,8 +103,9 @@ tBTM_STATUS bluetooth::shim::BTM_RestoreFilterAcceptList( 
    std::promise<bool> accept_promise;

    auto accept_future = accept_promise.get_future();



    tBLE_BD_ADDR bdadr = BTM_Sec_GetAddressWithType(address_pair.first);

    Stack::GetInstance()->GetAcl()->AcceptLeConnectionFrom(

        ToAddressWithType(address_pair.first, address_pair.second),

        ToAddressWithType(bdadr.bda, bdadr.type),

        /*is_direct=*/false, std::move(accept_promise));



    accept_future.wait();