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

Commit 8f9cf65a authored Jun 26, 2024 by Himanshu Rawat Committed by Automerger Merge Worker Jun 26, 2024

Merge "Removing flag correct_bond_type_of_loaded_devices" into main am: 427d4235 am: 936bed35

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

Change-Id: If747e7623e1f1eba2cbd70a03cc28846dd4d4c50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cfb217d3 936bed35

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) {