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

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

Merge "Prevent to consolidated empty address" am: 54a9d1d8 am: 17a47a46... 

Merge "Prevent to consolidated empty address" am: 54a9d1d8 am: 17a47a46 am: 96a0e6ab am: 94797661

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

Change-Id: I63b4634bcef7a57be504876640a49d8d2636d211
parents d9060bc6 94797661

system/btif/src/btif_storage.cc

+8 −2
Original line number Diff line number Diff line
@@ -952,11 +952,17 @@ void btif_storage_load_consolidate_devices(void) { 
        LOG_INFO("found consolidated device %s %s",

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

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



        if (bonded_devices.devices[i].IsEmpty() ||

            key.pid_key.identity_addr.IsEmpty()) {

          LOG_WARN("Address is empty! Skip");

        } else {

          consolidated_devices.emplace_back(bonded_devices.devices[i],

                                            key.pid_key.identity_addr);

        }

      }

    }

  }



  bt_property_t adapter_prop = {};

  /* Send the adapter_properties_cb with bonded consolidated device */