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

Commit d23508da authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Automerger Merge Worker
Browse files

Merge "GD: Load resolving list on peer irk notification" am: d00b5a8d am:... 

Merge "GD: Load resolving list on peer irk notification" am: d00b5a8d am: 1d894dd4 am: 116a0c84 am: 276338d0

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



Change-Id: I7be20d29f0d7d160ea8a55d813babf87d37af504
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc5e4b0c 276338d0

system/stack/btm/btm_ble.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -141,8 +141,8 @@ void BTM_SecAddBleKey(const RawAddress& bd_addr, tBTM_LE_KEY_VALUE* p_le_key, 
            key_type);

            key_type);





  btm_sec_save_le_key(bd_addr, key_type, p_le_key, false);

  btm_sec_save_le_key(bd_addr, key_type, p_le_key, false);



  // Only set peer irk. Local irk is always the same.

  if (key_type == BTM_LE_KEY_PID || key_type == BTM_LE_KEY_LID) {

  if (key_type == BTM_LE_KEY_PID) {

    btm_ble_resolving_list_load_dev(*p_dev_rec);

    btm_ble_resolving_list_load_dev(*p_dev_rec);

  }

  }

}

}

system/stack/btm/btm_ble_privacy.cc

+2 −6
Original line number Original line Diff line number Diff line
@@ -647,10 +647,6 @@ static void btm_ble_ble_unsupported_resolving_list_load_dev( 
  return;

  return;

}

}





static bool is_local_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {

  return dev_rec.ble.key_type & BTM_LE_KEY_LID;

}



static bool is_peer_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {

static bool is_peer_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {

  return dev_rec.ble.key_type & BTM_LE_KEY_PID;

  return dev_rec.ble.key_type & BTM_LE_KEY_PID;

}

}
@@ -667,8 +663,8 @@ void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& dev_rec) { 
    return btm_ble_ble_unsupported_resolving_list_load_dev(&dev_rec);

    return btm_ble_ble_unsupported_resolving_list_load_dev(&dev_rec);

  }

  }





  if (!is_local_identity_key_valid(dev_rec) &&

  // No need to check for local identity key validity. It remains unchanged.

      !is_peer_identity_key_valid(dev_rec)) {

  if (!is_peer_identity_key_valid(dev_rec)) {

    LOG_INFO("Peer is not an RPA enabled device:%s",

    LOG_INFO("Peer is not an RPA enabled device:%s",

             PRIVATE_ADDRESS(dev_rec.ble.identity_address_with_type));

             PRIVATE_ADDRESS(dev_rec.ble.identity_address_with_type));

    return;

    return;