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

Commit 32e7ea5d authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

BTM_SecAddDevice: features is always nullptr am: 43548575 am: 590ea1e8 am:... 

BTM_SecAddDevice: features is always nullptr am: 43548575 am: 590ea1e8 am: bee14aee am: 814b2bfa

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

Change-Id: Ia5478a2de1ea6cc4ac02b92434829319c1d032ff
parents 069b215e 814b2bfa

system/stack/btm/btm_dev.cc

+1 −16
Original line number Diff line number Diff line
@@ -100,22 +100,7 @@ bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, 
  }



  p_dev_rec->num_read_pages = 0;

  if (features) {

    bool found = false;

    memcpy(p_dev_rec->feature_pages, features,

           sizeof(p_dev_rec->feature_pages));

    for (int i = HCI_EXT_FEATURES_PAGE_MAX; !found && i >= 0; i--) {

      for (int j = 0; j < HCI_FEATURE_BYTES_PER_PAGE; j++) {

        if (p_dev_rec->feature_pages[i][j] != 0) {

          found = true;

          p_dev_rec->num_read_pages = i + 1;

          break;

        }

      }

    }

  } else {

  memset(p_dev_rec->feature_pages, 0, sizeof(p_dev_rec->feature_pages));

  }



  if (p_link_key) {

    VLOG(2) << __func__ << ": BDA: " << bd_addr;