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

Commit f08d83ab authored Jan 02, 2025 by Treehugger Robot Committed by Automerger Merge Worker Jan 02, 2025

Merge "Remove flag remove_address_map_on_unbond" into main am: a8b3be22

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

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

parents 2a6826d9 a8b3be22

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1440,7 +1440,7 @@ public class RemoteDevices {
		void onBondStateChange(BluetoothDevice device, int newState) {
		String address = device.getAddress();

		if (Flags.removeAddressMapOnUnbond() && newState == BluetoothDevice.BOND_NONE) {
		if (newState == BluetoothDevice.BOND_NONE) {
		removeAddressMapping(address);
		}
		}

flags/framework.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -27,16 +27,6 @@ flag {
		}
		}

		flag {
		name: "remove_address_map_on_unbond"
		namespace: "bluetooth"
		description: "Removes the address map when the bond is removed"
		bug: "335465028"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "support_bluetooth_quality_report_v6"
		is_exported: true