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

Commit 4613e75f authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Automerger Merge Worker
Browse files

Merge "Fix test issue when identity address null flag enabled" into main am:... 

Merge "Fix test issue when identity address null flag enabled" into main am: 8853894c am: 35e88a4e

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



Change-Id: Icb75d77fa388de27e2943c8a113b9194f18e8352
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66c4f91a 35e88a4e

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+3 −1
Original line number Diff line number Diff line
@@ -865,7 +865,9 @@ public class AdapterServiceTest { 
        RemoteDevices remoteDevices = mAdapterService.getRemoteDevices();

        remoteDevices.addDeviceProperties(Utils.getBytesFromAddress((TEST_BT_ADDR_1)));

        String identityAddress = mAdapterService.getIdentityAddress(TEST_BT_ADDR_1);

        if (!Flags.identityAddressNullIfUnknown()) {

            assertThat(identityAddress).isEqualTo(TEST_BT_ADDR_1);

        }



        // Trigger address consolidate callback

        remoteDevices.addressConsolidateCallback(Utils.getBytesFromAddress(TEST_BT_ADDR_1),