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

Commit 395e3b32 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't change address type of address filter " am: 0995e414 am: ab13a561 am: ab32d01f 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1842714

Change-Id: Id638793c84845cfba90def923d5abd8aee279b63
parents eb217be6 ab32d01f

system/stack/btm/btm_ble_adv_filter.cc

+4 −3
Original line number Diff line number Diff line
@@ -479,12 +479,13 @@ static void BTM_LE_PF_addr_filter(tBTM_BLE_SCAN_COND_OP action, 
  UINT8_TO_STREAM(p, filt_index);



  if (action != BTM_BLE_SCAN_COND_CLEAR) {

    if (addr.type == BLE_ADDR_PUBLIC_ID) {

    if (addr.type == 2 /* DEVICE_TYPE_ALL in ScanFilterQueue.java */) {

      LOG(INFO) << __func__ << " Filter address " << addr.bda

                << " has type PUBLIC_ID, try to get identity address";

                << " has DEVICE_TYPE_ALL, try to get identity address";

      /* If no matching identity address is found for the input address,

       * this call will have no effect. */

      btm_random_pseudo_to_identity_addr(&addr.bda, &addr.type);

      uint8_t dummy_addr_type;

      btm_random_pseudo_to_identity_addr(&addr.bda, &dummy_addr_type);

    }



    LOG(INFO) << __func__