From 9f17bbdb1bb1e3db08376ecb582dd1ece7d4e13d Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Thu, 20 Jan 2022 17:10:46 +0100
Subject: [PATCH] Avoid double lookup in cdm association store

This CL avoids unnecessary calls to getDeviceMacAddress() in the
updateAssociations method.

Test: atest CtsCompanionDeviceManagerCoreTestCases
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases
Change-Id: I35cfb24afe6ad3345347fe9e385935fea481407f
---
 .../com/android/server/companion/AssociationStoreImpl.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
index dbcdd0f877a1d..6f7e50632250e 100644
--- a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
+++ b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
@@ -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);