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

Commit b36ae0e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes If53d59b6,Ice2ec28f into tm-dev 

* changes:
  Fix UUID issue of address consolidateion
  Do not consolidate pure LE device
parents 83094ae5 06a90689

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ final class RemoteDevices { 
                            break;

                        case AbstractionLayer.BT_PROPERTY_TYPE_OF_DEVICE:

                            if (device.isConsolidated()) {

                                return;

                                break;

                            }

                            // The device type from hal layer, defined in bluetooth.h,

                            // matches the type defined in BluetoothDevice.java

system/btif/src/btif_storage.cc

+7 −1
Original line number Diff line number Diff line
@@ -945,6 +945,10 @@ static void remove_devices_with_sample_ltk() { 
void btif_storage_load_consolidate_devices(void) {

  btif_bonded_devices_t bonded_devices;

  btif_in_fetch_bonded_devices(&bonded_devices, 1);

  std::unordered_set<RawAddress> bonded_addresses;

  for (uint16_t i = 0; i < bonded_devices.num_devices; i++) {

    bonded_addresses.insert(bonded_devices.devices[i]);

  }



  std::vector<std::pair<RawAddress, RawAddress>> consolidated_devices;

  for (uint16_t i = 0; i < bonded_devices.num_devices; i++) {
@@ -953,7 +957,9 @@ void btif_storage_load_consolidate_devices(void) { 
    if (btif_storage_get_ble_bonding_key(

            bonded_devices.devices[i], BTM_LE_KEY_PID, (uint8_t*)&key,

            sizeof(tBTM_LE_PID_KEYS)) == BT_STATUS_SUCCESS) {

      if (bonded_devices.devices[i] != key.pid_key.identity_addr) {

      if (bonded_devices.devices[i] != key.pid_key.identity_addr &&

          bonded_addresses.find(key.pid_key.identity_addr) !=

              bonded_addresses.end()) {

        LOG_INFO("found consolidated device %s %s",

                 bonded_devices.devices[i].ToString().c_str(),

                 key.pid_key.identity_addr.ToString().c_str());