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
This commit is contained in:
Nikolas Havrikov
2022-01-20 17:10:46 +01:00
parent ce65b04d56
commit 9f17bbdb1b

View File

@@ -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);