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

Commit 541ffd69 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Avoid double lookup in cdm association store"

parents ddbe2a11 9f17bbdb

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

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +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(

                    current.getDeviceMacAddress(), updated.getDeviceMacAddress());

            macAddressChanged = Objects.equals(currentAddress, updatedAddress);

            if (macAddressChanged) {

                if (currentAddress != null) {

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