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

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

Merge "Floss: Skip storing properties that will not be stored" am: 82763f0b 

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



Change-Id: Id6b5bda5203cf628c32f5d8d22310d89fa7bebea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 275a2fda 82763f0b

system/btif/src/btif_storage.cc

+7 −2
Original line number Original line Diff line number Diff line
@@ -802,8 +802,13 @@ bt_status_t btif_storage_add_remote_device(const RawAddress* remote_bd_addr, 
  /* TODO: If writing a property, fails do we go back undo the earlier

  /* TODO: If writing a property, fails do we go back undo the earlier

   * written properties? */

   * written properties? */

  for (i = 0; i < num_properties; i++) {

  for (i = 0; i < num_properties; i++) {

    /* Ignore the RSSI as this is not stored in DB */

    /* Ignore properties that are not stored in DB */

    if (properties[i].type == BT_PROPERTY_REMOTE_RSSI) continue;

    if (properties[i].type == BT_PROPERTY_REMOTE_RSSI ||

        properties[i].type == BT_PROPERTY_REMOTE_IS_COORDINATED_SET_MEMBER ||

        properties[i].type == BT_PROPERTY_REMOTE_ASHA_CAPABILITY ||

        properties[i].type == BT_PROPERTY_REMOTE_ASHA_TRUNCATED_HISYNCID) {

      continue;

    }





    /* address for remote device needs special handling as we also store

    /* address for remote device needs special handling as we also store

     * timestamp */

     * timestamp */