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

Commit 895defc3 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Fix checking if association's MAC address changed in AssociationStoreImpl 

Test: atest CtsCompanionDeviceManagerCoreTestCases
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases
Test: atest CtsOsTestCases:CompanionDeviceManagerTest
Change-Id: I8360035a793d1ba8a4f736e2b0d894decf337a26
parent 2d0e9dee

services/companion/java/com/android/server/companion/AssociationStoreImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class AssociationStoreImpl implements AssociationStore { 
            // Update the MacAddress-to-List<Association> map if needed.

            final MacAddress updatedAddress = updated.getDeviceMacAddress();

            final MacAddress currentAddress = current.getDeviceMacAddress();

            macAddressChanged = Objects.equals(currentAddress, updatedAddress);

            macAddressChanged = !Objects.equals(currentAddress, updatedAddress);

            if (macAddressChanged) {

                if (currentAddress != null) {

                    mAddressMap.get(currentAddress).remove(id);