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

Commit 427d4235 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Gerrit Code Review
Browse files

Merge "Removing flag correct_bond_type_of_loaded_devices" into main

parents 2994d0a9 a38f5ec2

flags/security.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ flag { 
    bug: "333634398"

}



flag {

    name: "correct_bond_type_of_loaded_devices"

    namespace: "bluetooth"

    description: "Mark the bond type of loaded device as persistent"

    bug: "319530790"

}



flag {

    name: "bluffs_mitigation"

    namespace: "bluetooth"

system/stack/btm/btm_dev.cc

+1 −3
Original line number Diff line number Diff line
@@ -125,9 +125,7 @@ void BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, 
  p_dev_rec->sec_rec.link_key_type = key_type;

  p_dev_rec->sec_rec.pin_code_length = pin_length;



  if (com::android::bluetooth::flags::correct_bond_type_of_loaded_devices()) {

  p_dev_rec->sec_rec.bond_type = BOND_TYPE_PERSISTENT;

  }



  if (pin_length >= 16 || key_type == BTM_LKEY_TYPE_AUTH_COMB ||

      key_type == BTM_LKEY_TYPE_AUTH_COMB_P_256) {