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

Commit bf86f01f authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Remove flag temporary_pairing_device_properties am: d3c001b8 

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



Change-Id: Ic4118f7963c62759f988047ab74c3fa3b123c059
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd3d8fc1 d3c001b8

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

+15 −17
Original line number Diff line number Diff line
@@ -1405,7 +1405,6 @@ public class RemoteDevices { 
    }



    private void removeAddressMapping(String address) {

        if (Flags.temporaryPairingDeviceProperties()) {

        DeviceProperties deviceProperties = mDevices.get(address);

        if (deviceProperties != null) {

            String pseudoAddress = mDualDevicesMap.get(address);
@@ -1425,7 +1424,6 @@ public class RemoteDevices { 
                return;

            }

        }

        }



        synchronized (mDevices) {

            mDevices.remove(address);

flags/pairing.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -21,16 +21,6 @@ flag { 
    }

}



flag {

    name: "temporary_pairing_device_properties"

    namespace: "bluetooth"

    description: "Do not remove the device properties immediately after insecure pairing"

    bug: "342202557"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "pairing_name_discovery_addresss_mismatch"

    namespace: "bluetooth"