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

Commit 8853894c authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Gerrit Code Review
Browse files

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

parents a239be44 b3bbc9f2

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