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

Return a copy of the "real" set in AssociationStore

Browse Source 
Return a copy of the "real" set AssociationSet from
AssociationStoreImpl.getAssociations(), which fixes
ConcurrentModificationException-s that arise if a direct reference to
the mIdMap.values() collection is returned.

Bug: 220018043
Test: atest CtsCompanionDeviceManagerCoreTestCases
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases
Test: manually install companion app, create a CDM Association with a
      BLE companion device, uninstall the app.
Change-Id: Ie0ecab7fe61923ecef1541cb9f6450742c4b83b2
This commit is contained in:
Sergey Nikolaienkov
2022-02-18 11:25:42 +01:00
parent 4d897c6ad0
commit a2d34f4f05
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) {