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

Commit 325a0e96 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Automerger Merge Worker
Browse files

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

Merge "floss: add identity address to accept list if ll privacy is enabled" into main am: 97465680

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



Change-Id: I5d19e0005e1b8eee4efad354dec8c73df45d2780
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38fefd42 97465680

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();