Merge "Remove "identity_retention_on_restart" flag" into main (8455ab95) · Commits · e / os / android_packages_modules_Bluetooth

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -1186,15 +1186,6 @@ public class RemoteDevices {
		DeviceProperties deviceProperties;
		BluetoothDevice device = getDevice(mainAddress);
		if (device == null) {
		if (!Flags.identityRetentionOnRestart()) {
		errorLog(
		"addressConsolidateCallback: device is NULL, address="
		+ Utils.getRedactedAddressStringFromByte(mainAddress)
		+ ", secondaryAddress="
		+ Utils.getRedactedAddressStringFromByte(secondaryAddress));
		return;
		}

		deviceProperties = addDeviceProperties(mainAddress);
		device = deviceProperties.getDevice();
		} else {
		@@ -1227,16 +1218,6 @@ public class RemoteDevices {
		DeviceProperties deviceProperties;
		BluetoothDevice device = getDevice(mainAddress);
		if (device == null) {
		if (!Flags.identityRetentionOnRestart()) {
		errorLog(
		"leAddressAssociateCallback: device is NULL, address="
		+ Utils.getRedactedAddressStringFromByte(mainAddress)
		+ ", secondaryAddress="
		+ Utils.getRedactedAddressStringFromByte(secondaryAddress)
		+ ", identityAddressTypeFromNative="
		+ identityAddressTypeFromNative);
		return;
		}
		deviceProperties = addDeviceProperties(mainAddress);
		device = deviceProperties.getDevice();
		} else {

+0 −10

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

		flag {
		name: "identity_retention_on_restart"
		namespace: "bluetooth"
		description: "Retain identity address on BT restart"
		bug: "383879096"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "bonded_device_smp_failure_handling"
		namespace: "bluetooth"