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

Commit c1f6ac4f authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

Remove cleanup_le_only_device_type 

Bug: 333949759
Test: mma -j32;
Flag: com.android.bluetooth.flags.cleanup_le_only_device_type
Change-Id: I0c06de4cfe85833d62fbc97d971295beea04233b
parent f7aa9fc3

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

flags/pairing.aconfig

+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"