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

Merge "Return a copy of the "real" set in AssociationStore" into tm-dev am: 329d5a13a5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940225

Change-Id: I160f835889df521f762091fda02a740c0b31093d
This commit is contained in:
TreeHugger Robot
2022-02-21 16:47:33 +00:00
committed by Automerger Merge Worker
parent 37626e1b96 329d5a13a5
commit 631cb811ed
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/companion/java/com/android/server/companion/AssociationStoreImpl.java
View File

@@ -171,12 +171,20 @@ class AssociationStoreImpl implements AssociationStore {
broadcastChange(CHANGE_TYPE_REMOVED, association);
}
/**
* @return a "snapshot" of the current state of the existing associations.
*/
public @NonNull Collection<AssociationInfo> getAssociations() {
final Collection<AssociationInfo> allAssociations;
synchronized (mLock) {
allAssociations = mIdMap.values();
// IMPORTANT: make and return a COPY of the mIdMap.values(), NOT a "direct" reference.
// The HashMap.values() returns a collection which is backed by the HashMap, so changes
// to the HashMap are reflected in this collection.
// For us this means that if mIdMap is modified while the iteration over mIdMap.values()
// is in progress it may lead to "undefined results" (according to the HashMap's
// documentation) or cause ConcurrentModificationExceptions in the iterator (according
// to the bugreports...).
return List.copyOf(mIdMap.values());
}
return Collections.unmodifiableCollection(allAssociations);
}
public @NonNull List<AssociationInfo> getAssociationsForUser(@UserIdInt int userId) {