Merge "Remove cleanup_le_only_device_type" into main (455c3f05) · Commits · e / os / android_packages_modules_Bluetooth

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -531,7 +531,7 @@ class AdapterProperties {
		return;
		}

		if (Flags.cleanupLeOnlyDeviceType() && deviceType != BluetoothDevice.DEVICE_TYPE_LE) {
		if (deviceType != BluetoothDevice.DEVICE_TYPE_LE) {
		return;
		}

		@@ -547,12 +547,8 @@ class AdapterProperties {
		boolean removeExisting = false;
		if (identityAddress.equals(existingIdentityAddress)
		&& !address.equals(existingAddress)) {
		if (Flags.cleanupLeOnlyDeviceType()) {
		// Existing device record should be removed only if the device type is LE-only
		removeExisting = (existingDeviceType == BluetoothDevice.DEVICE_TYPE_LE);
		} else {
		removeExisting = true;
		}
		}

		if (removeExisting) {

+0 −7

Original line number	Diff line number	Diff line
		@@ -11,13 +11,6 @@ flag {
		}
		}

		flag {
		name: "cleanup_le_only_device_type"
		namespace: "bluetooth"
		description: "Cleanup the duplicate bond records only if the device type is LE-only"
		bug: "333949759"
		}

		flag {
		name: "pairing_on_unknown_transport"
		namespace: "bluetooth"