Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid double lookup in cdm association store"

Browse Source
This commit is contained in:
Sergey Nikolaienkov
2022-01-21 07:23:48 +00:00
committed by Android (Google) Code Review
parent ddbe2a11cf 9f17bbdb1b
commit 541ffd698b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/companion/java/com/android/server/companion/AssociationStoreImpl.java
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);