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

Commit 5dacbccc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove "identity_retention_on_restart" flag" into main am: 8455ab95 

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



Change-Id: I624c385129439fa4f0b3c4511e6c33c24cc56c94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d43c8be 8455ab95

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 {

flags/pairing.aconfig

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